pdfviewer: code cleanup - add licence on files, make replace __DEFINE__foo with foo_DEFINED to match skia project

Review URL: https://codereview.chromium.org/23361009

git-svn-id: http://skia.googlecode.com/svn/trunk@10854 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/experimental/PdfViewer/SkNulCanvas.cpp b/experimental/PdfViewer/SkNulCanvas.cpp
index 7bd69f0..640fba8 100644
--- a/experimental/PdfViewer/SkNulCanvas.cpp
+++ b/experimental/PdfViewer/SkNulCanvas.cpp
@@ -1 +1,8 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkNulCanvas.h"
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h
index 27dd991..98d9583 100644
--- a/experimental/PdfViewer/SkNulCanvas.h
+++ b/experimental/PdfViewer/SkNulCanvas.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_SKNULCANVAS_H_
-#define EXPERIMENTAL_PDFVIEWER_SKNULCANVAS_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkNulCanvas_DEFINED
+#define SkNulCanvas_DEFINED
 
 #include "SkCanvas.h"
 
@@ -89,4 +96,4 @@
     typedef SkCanvas INHERITED;
 };
 
-#endif  // EXPERIMENTAL_PDFVIEWER_SKNULCANVAS_H_
+#endif  // SkNulCanvas_DEFINED
diff --git a/experimental/PdfViewer/SkPdfConfig.h b/experimental/PdfViewer/SkPdfConfig.h
index 014f089..b795f84 100644
--- a/experimental/PdfViewer/SkPdfConfig.h
+++ b/experimental/PdfViewer/SkPdfConfig.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfConfig
-#define __DEFINED__SkPdfConfig
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfConfig_DEFINED
+#define SkPdfConfig_DEFINED
 
 //#define PDF_TRACE
 //#define PDF_TRACE_READ_TOKEN
@@ -9,4 +16,4 @@
 //#define PDF_DEBUG_NO_PAGE_CLIPING
 //#define PDF_DEBUG_3X
 
-#endif  // __DEFINED__SkPdfConfig
+#endif  // SkPdfConfig_DEFINED
diff --git a/experimental/PdfViewer/SkPdfFont.cpp b/experimental/PdfViewer/SkPdfFont.cpp
index 90c54e5..f8dfa05 100644
--- a/experimental/PdfViewer/SkPdfFont.cpp
+++ b/experimental/PdfViewer/SkPdfFont.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFont.h"
 
 #include "SkStream.h"
diff --git a/experimental/PdfViewer/SkPdfFont.h b/experimental/PdfViewer/SkPdfFont.h
index 3c850a6..09e01ac 100644
--- a/experimental/PdfViewer/SkPdfFont.h
+++ b/experimental/PdfViewer/SkPdfFont.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFont
-#define __DEFINED__SkPdfFont
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFont_DEFINED
+#define SkPdfFont_DEFINED
 
 #include "SkPdfHeaders_autogen.h"
 #include "SkPdfMapper_autogen.h"
@@ -440,4 +447,4 @@
     }
 };
 
-#endif  // __DEFINED__SkPdfFont
+#endif  // SkPdfFont_DEFINED
diff --git a/experimental/PdfViewer/SkPdfGraphicsState.cpp b/experimental/PdfViewer/SkPdfGraphicsState.cpp
index 3e7f7a8..498a6a7 100644
--- a/experimental/PdfViewer/SkPdfGraphicsState.cpp
+++ b/experimental/PdfViewer/SkPdfGraphicsState.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfGraphicsState.h"
 #include "SkPdfNativeTokenizer.h"
 
diff --git a/experimental/PdfViewer/SkPdfGraphicsState.h b/experimental/PdfViewer/SkPdfGraphicsState.h
index 7ed1fd3..0928f44 100644
--- a/experimental/PdfViewer/SkPdfGraphicsState.h
+++ b/experimental/PdfViewer/SkPdfGraphicsState.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfBasics
-#define __DEFINED__SkPdfBasics
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfGraphicsState_DEFINED
+#define SkPdfGraphicsState_DEFINED
 
 #include "SkCanvas.h"
 #include "SkPaint.h"
@@ -471,4 +478,4 @@
     ~SkPdfContext();
 };
 
-#endif  // __DEFINED__SkPdfBasics
+#endif  // SkPdfGraphicsState_DEFINED
diff --git a/experimental/PdfViewer/SkPdfUtils.cpp b/experimental/PdfViewer/SkPdfUtils.cpp
index e3128f6..c77baf4 100644
--- a/experimental/PdfViewer/SkPdfUtils.cpp
+++ b/experimental/PdfViewer/SkPdfUtils.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfUtils.h"
 
 bool operator !=(const SkString& first, const char* second) {
diff --git a/experimental/PdfViewer/SkPdfUtils.h b/experimental/PdfViewer/SkPdfUtils.h
index 11a5d2c..b18c727 100644
--- a/experimental/PdfViewer/SkPdfUtils.h
+++ b/experimental/PdfViewer/SkPdfUtils.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfUtils
-#define __DEFINED__SkPdfUtils
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfUtils_DEFINED
+#define SkPdfUtils_DEFINED
 
 #include "SkMatrix.h"
 #include "SkRect.h"
@@ -63,4 +70,4 @@
 #define SkTraceRect(a,b)
 #endif
 
-#endif   // __DEFINED__SkPdfUtils
+#endif   // SkPdfUtils_DEFINED
diff --git a/experimental/PdfViewer/SkTrackDevice.cpp b/experimental/PdfViewer/SkTrackDevice.cpp
index b7f6d62..5c6dff8 100644
--- a/experimental/PdfViewer/SkTrackDevice.cpp
+++ b/experimental/PdfViewer/SkTrackDevice.cpp
@@ -1,2 +1,8 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkTrackDevice.h"
diff --git a/experimental/PdfViewer/SkTrackDevice.h b/experimental/PdfViewer/SkTrackDevice.h
index 6f26121..545250b 100644
--- a/experimental/PdfViewer/SkTrackDevice.h
+++ b/experimental/PdfViewer/SkTrackDevice.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_SKTRACKDEVICE_H_
-#define EXPERIMENTAL_PDFVIEWER_SKTRACKDEVICE_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTrackDevice_DEFINED
+#define SkTrackDevice_DEFINED
 
 #include "SkDevice.h"
 #include "SkTracker.h"
@@ -174,4 +181,4 @@
     typedef SkDevice INHERITED;
 };
 
-#endif  // EXPERIMENTAL_PDFVIEWER_SKTRACKDEVICE_H_
+#endif  // SkTrackDevice_DEFINED
diff --git a/experimental/PdfViewer/SkTracker.cpp b/experimental/PdfViewer/SkTracker.cpp
index b7f56bd..acc52fe 100644
--- a/experimental/PdfViewer/SkTracker.cpp
+++ b/experimental/PdfViewer/SkTracker.cpp
@@ -1,2 +1,8 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkTracker.h"
diff --git a/experimental/PdfViewer/SkTracker.h b/experimental/PdfViewer/SkTracker.h
index 3b02964..6a6161f 100644
--- a/experimental/PdfViewer/SkTracker.h
+++ b/experimental/PdfViewer/SkTracker.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_SKTRACKER_H_
-#define EXPERIMENTAL_PDFVIEWER_SKTRACKER_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkTracker_DEFINED
+#define SkTracker_DEFINED
 
 #include "SkBitmap.h"
 #include "SkPoint.h"
@@ -171,4 +178,4 @@
     int fHits;
 };
 
-#endif  // EXPERIMENTAL_PDFVIEWER_SKTRACKER_H_
+#endif  // SkTracker_DEFINED
diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp
index 8949e7e..ca2a9da 100644
--- a/experimental/PdfViewer/pdf_viewer_main.cpp
+++ b/experimental/PdfViewer/pdf_viewer_main.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkCanvas.h"
 #include "SkCommandLineFlags.h"
 #include "SkDevice.h"
diff --git a/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp b/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp
index 9f232fe..988c8cc 100644
--- a/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp
+++ b/experimental/PdfViewer/pdfparser/SkPdfNYI.cpp
@@ -1,2 +1,8 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkPdfNYI.h"
diff --git a/experimental/PdfViewer/pdfparser/SkPdfNYI.h b/experimental/PdfViewer/pdfparser/SkPdfNYI.h
index 4d4b2e8..c9b483f 100644
--- a/experimental/PdfViewer/pdfparser/SkPdfNYI.h
+++ b/experimental/PdfViewer/pdfparser/SkPdfNYI.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_PDFPARSER_SKPDFNYI_H_
-#define EXPERIMENTAL_PDFVIEWER_PDFPARSER_SKPDFNYI_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNYI_DEFINED
+#define SkPdfNYI_DEFINED
 
 struct SkPdfFileSpec {};
 
@@ -10,4 +17,4 @@
 struct SkPdfFunction {};
 
 
-#endif  // EXPERIMENTAL_PDFVIEWER_PDFPARSER_SKPDFNYI_H_
+#endif  // SkPdfNYI_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
index c0156cf..c32d5ff 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfNativeDoc.h"
 #include "SkPdfNativeTokenizer.h"
 #include "SkPdfNativeObject.h"
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.h b/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.h
index 5f22c42..ae89e8f 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.h
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeDoc.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKNATIVEPARSEDPDF_H_
-#define EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKNATIVEPARSEDPDF_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNativeDoc_DEFINED
+#define SkPdfNativeDoc_DEFINED
 
 #include "SkRect.h"
 #include "SkTDArray.h"
@@ -102,4 +109,4 @@
     SkTDArray<SkPdfPageObjectDictionary*> fPages;
 };
 
-#endif  // EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKNATIVEPARSEDPDF_H_
+#endif  // SkPdfNativeDoc_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
index 26f9897..5a1a6ca 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkPdfNativeObject.h"
 
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h
index 187f2b8..a06998c 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeObject.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKPDFOBJECT_H_
-#define EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKPDFOBJECT_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNativeObject_DEFINED
+#define SkPdfNativeObject_DEFINED
 
 #include <stdint.h>
 #include <string.h>
@@ -1037,4 +1044,4 @@
     }
 };
 
-#endif  // EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKPDFOBJECT_H_
+#endif  // SkPdfNativeObject
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
index 178ca6c..42654ff 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.cpp
@@ -1,3 +1,9 @@
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
 
 #include "SkPdfNativeTokenizer.h"
 #include "SkPdfNativeObject.h"
diff --git a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.h b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.h
index a67a308..56bf263 100644
--- a/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.h
+++ b/experimental/PdfViewer/pdfparser/native/SkPdfNativeTokenizer.h
@@ -1,5 +1,12 @@
-#ifndef EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKPDFNATIVETOKENIZER_H_
-#define EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKPDFNATIVETOKENIZER_H_
+/*
+ * Copyright 2013 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNativeTokenizer_DEFINED
+#define SkPdfNativeTokenizer_DEFINED
 
 #include "SkTDArray.h"
 #include "SkTDict.h"
@@ -150,4 +157,4 @@
     PdfToken fPutBack;
 };
 
-#endif  // EXPERIMENTAL_PDFVIEWER_PDFPARSER_NATIVE_SKPDFNATIVETOKENIZER_H_
+#endif  // SkPdfNativeTokenizer_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.cpp
index b639511..671c64f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfALinkAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfALinkAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.h
index 4c856d1..680da4a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfALinkAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfALinkAnnotationDictionary
-#define __DEFINED__SkPdfALinkAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfALinkAnnotationDictionary_DEFINED
+#define SkPdfALinkAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,10 +522,13 @@
   bool has_Subtype() const;
   SkString Contents(SkPdfNativeDoc* doc);
   bool has_Contents() const;
+
   bool isDestAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getDestAsArray(SkPdfNativeDoc* doc);
+
   bool isDestAName(SkPdfNativeDoc* doc);
   SkString getDestAsName(SkPdfNativeDoc* doc);
+
   bool isDestAString(SkPdfNativeDoc* doc);
   SkString getDestAsString(SkPdfNativeDoc* doc);
   bool has_Dest() const;
@@ -528,4 +538,4 @@
   bool has_PA() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfALinkAnnotationDictionary
+#endif  // SkPdfALinkAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.cpp
index 7172689..eff5e8d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfActionDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.h
index ee8b79f..a83a065 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfActionDictionary
-#define __DEFINED__SkPdfActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfActionDictionary_DEFINED
+#define SkPdfActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,11 +522,13 @@
   bool has_Type() const;
   SkString S(SkPdfNativeDoc* doc);
   bool has_S() const;
+
   bool isNextADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getNextAsDictionary(SkPdfNativeDoc* doc);
+
   bool isNextAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getNextAsArray(SkPdfNativeDoc* doc);
   bool has_Next() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfActionDictionary
+#endif  // SkPdfActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.cpp
index 2d184d5..607eb34 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfAlternateImageDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfStream* SkPdfAlternateImageDictionary::Image(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Image", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.h
index b5ce4fa..adfe725 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAlternateImageDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfAlternateImageDictionary
-#define __DEFINED__SkPdfAlternateImageDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfAlternateImageDictionary_DEFINED
+#define SkPdfAlternateImageDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_DefaultForPrinting() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfAlternateImageDictionary
+#endif  // SkPdfAlternateImageDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.cpp
index 56b946f..ecb9eb0 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfAnnotationActionsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfAnnotationActionsDictionary::E(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("E", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.h
index 94cad4d..52f2175 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationActionsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfAnnotationActionsDictionary
-#define __DEFINED__SkPdfAnnotationActionsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfAnnotationActionsDictionary_DEFINED
+#define SkPdfAnnotationActionsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_Bl() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfAnnotationActionsDictionary
+#endif  // SkPdfAnnotationActionsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.cpp
index c5514c6..390ed05 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfAnnotationDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.h
index fa429ea..2b54459 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfAnnotationDictionary
-#define __DEFINED__SkPdfAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfAnnotationDictionary_DEFINED
+#define SkPdfAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -522,8 +529,10 @@
   SkRect Rect(SkPdfNativeDoc* doc);
   bool has_Rect() const;
   bool has_NM() const;
+
   bool isMADate(SkPdfNativeDoc* doc);
   SkPdfDate getMAsDate(SkPdfNativeDoc* doc);
+
   bool isMAString(SkPdfNativeDoc* doc);
   SkString getMAsString(SkPdfNativeDoc* doc);
   bool has_M() const;
@@ -553,4 +562,4 @@
   bool has_StructParent() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfAnnotationDictionary
+#endif  // SkPdfAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp
index ce1273f..d770e14 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfAppearanceCharacteristicsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfAppearanceCharacteristicsDictionary::R(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("R", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.h
index 0ace298..ae551b6 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceCharacteristicsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfAppearanceCharacteristicsDictionary
-#define __DEFINED__SkPdfAppearanceCharacteristicsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfAppearanceCharacteristicsDictionary_DEFINED
+#define SkPdfAppearanceCharacteristicsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -535,4 +542,4 @@
   bool has_TP() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfAppearanceCharacteristicsDictionary
+#endif  // SkPdfAppearanceCharacteristicsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.cpp
index 393fe16..1007391 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfAppearanceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfAppearanceDictionary::isNAStream(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("N", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.h
index a9dbee4..2e8cb9b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAppearanceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfAppearanceDictionary
-#define __DEFINED__SkPdfAppearanceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfAppearanceDictionary_DEFINED
+#define SkPdfAppearanceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -511,21 +518,27 @@
 
 public:
    bool valid() const {return true;}
+
   bool isNAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getNAsStream(SkPdfNativeDoc* doc);
+
   bool isNADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getNAsDictionary(SkPdfNativeDoc* doc);
   bool has_N() const;
+
   bool isRAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getRAsStream(SkPdfNativeDoc* doc);
+
   bool isRADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getRAsDictionary(SkPdfNativeDoc* doc);
   bool has_R() const;
+
   bool isDAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getDAsStream(SkPdfNativeDoc* doc);
+
   bool isDADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getDAsDictionary(SkPdfNativeDoc* doc);
   bool has_D() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfAppearanceDictionary
+#endif  // SkPdfAppearanceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.cpp
index d9444c9..f8ce7c6 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfApplicationDataDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDate SkPdfApplicationDataDictionary::LastModified(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("LastModified", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.h
index 3bf2cf5..8e32827 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfApplicationDataDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfApplicationDataDictionary
-#define __DEFINED__SkPdfApplicationDataDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfApplicationDataDictionary_DEFINED
+#define SkPdfApplicationDataDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_Private() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfApplicationDataDictionary
+#endif  // SkPdfApplicationDataDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.cpp
index 3896ddb..e46b993 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfArtifactsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfArtifactsDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.h
index cfeb612..f91e675 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfArtifactsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfArtifactsDictionary
-#define __DEFINED__SkPdfArtifactsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfArtifactsDictionary_DEFINED
+#define SkPdfArtifactsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Attached() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfArtifactsDictionary
+#endif  // SkPdfArtifactsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.cpp
index 6aab18d..740906c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfAttributeObjectDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfAttributeObjectDictionary::O(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("O", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.h
index e6f1780..ef8ce23 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfAttributeObjectDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfAttributeObjectDictionary
-#define __DEFINED__SkPdfAttributeObjectDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfAttributeObjectDictionary_DEFINED
+#define SkPdfAttributeObjectDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_O() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfAttributeObjectDictionary
+#endif  // SkPdfAttributeObjectDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.cpp
index 4467f89..68c63494 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfBeadDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfBeadDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.h
index 2338b44..4103eff 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBeadDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfBeadDictionary
-#define __DEFINED__SkPdfBeadDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfBeadDictionary_DEFINED
+#define SkPdfBeadDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_R() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfBeadDictionary
+#endif  // SkPdfBeadDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp
index 6b8d6ee..496d91d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfBlockLevelStructureElementsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 double SkPdfBlockLevelStructureElementsDictionary::SpaceBefore(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("SpaceBefore", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.h
index be4578d..f320731 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBlockLevelStructureElementsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfBlockLevelStructureElementsDictionary
-#define __DEFINED__SkPdfBlockLevelStructureElementsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfBlockLevelStructureElementsDictionary_DEFINED
+#define SkPdfBlockLevelStructureElementsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,13 +532,17 @@
   bool has_TextAlign() const;
   SkRect BBox(SkPdfNativeDoc* doc);
   bool has_BBox() const;
+
   bool isWidthANumber(SkPdfNativeDoc* doc);
   double getWidthAsNumber(SkPdfNativeDoc* doc);
+
   bool isWidthAName(SkPdfNativeDoc* doc);
   SkString getWidthAsName(SkPdfNativeDoc* doc);
   bool has_Width() const;
+
   bool isHeightANumber(SkPdfNativeDoc* doc);
   double getHeightAsNumber(SkPdfNativeDoc* doc);
+
   bool isHeightAName(SkPdfNativeDoc* doc);
   SkString getHeightAsName(SkPdfNativeDoc* doc);
   bool has_Height() const;
@@ -541,4 +552,4 @@
   bool has_InlineAlign() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfBlockLevelStructureElementsDictionary
+#endif  // SkPdfBlockLevelStructureElementsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.cpp
index f131bcc..728f88b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfBorderStyleDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfBorderStyleDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.h
index 1177af1..d3a6e33 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBorderStyleDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfBorderStyleDictionary
-#define __DEFINED__SkPdfBorderStyleDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfBorderStyleDictionary_DEFINED
+#define SkPdfBorderStyleDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_D() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfBorderStyleDictionary
+#endif  // SkPdfBorderStyleDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.cpp
index 1215d3d..d2970fd 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfBoxColorInformationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfBoxColorInformationDictionary::CropBox(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("CropBox", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.h
index 817a001..633dd55 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxColorInformationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfBoxColorInformationDictionary
-#define __DEFINED__SkPdfBoxColorInformationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfBoxColorInformationDictionary_DEFINED
+#define SkPdfBoxColorInformationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_ArtBox() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfBoxColorInformationDictionary
+#endif  // SkPdfBoxColorInformationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.cpp
index 48b4832..9b44a4e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfBoxStyleDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfBoxStyleDictionary::C(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("C", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.h
index 661c948..e9b22cf 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfBoxStyleDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfBoxStyleDictionary
-#define __DEFINED__SkPdfBoxStyleDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfBoxStyleDictionary_DEFINED
+#define SkPdfBoxStyleDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_D() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfBoxStyleDictionary
+#endif  // SkPdfBoxStyleDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.cpp
index e0cc542..0d652e7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCIDFontDescriptorDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfCIDFontDescriptorDictionary::Style(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Style", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.h
index 501bc37..0885f81 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDescriptorDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCIDFontDescriptorDictionary
-#define __DEFINED__SkPdfCIDFontDescriptorDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCIDFontDescriptorDictionary_DEFINED
+#define SkPdfCIDFontDescriptorDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_CIDSet() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCIDFontDescriptorDictionary
+#endif  // SkPdfCIDFontDescriptorDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.cpp
index 1b0d9ac..2b25099 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCIDFontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfCIDFontDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.h
index 0bc4fef..028cbf0 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDFontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCIDFontDictionary
-#define __DEFINED__SkPdfCIDFontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCIDFontDictionary_DEFINED
+#define SkPdfCIDFontDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -529,11 +536,13 @@
   bool has_DW2() const;
   SkPdfArray* W2(SkPdfNativeDoc* doc);
   bool has_W2() const;
+
   bool isCIDToGIDMapAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getCIDToGIDMapAsStream(SkPdfNativeDoc* doc);
+
   bool isCIDToGIDMapAName(SkPdfNativeDoc* doc);
   SkString getCIDToGIDMapAsName(SkPdfNativeDoc* doc);
   bool has_CIDToGIDMap() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCIDFontDictionary
+#endif  // SkPdfCIDFontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.cpp
index 30de501..7a8e620 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCIDSystemInfoDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfCIDSystemInfoDictionary::Registry(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Registry", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.h
index e6190b4..e757bda 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCIDSystemInfoDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCIDSystemInfoDictionary
-#define __DEFINED__SkPdfCIDSystemInfoDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCIDSystemInfoDictionary_DEFINED
+#define SkPdfCIDSystemInfoDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Supplement() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCIDSystemInfoDictionary
+#endif  // SkPdfCIDSystemInfoDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.cpp
index 8e66a54..b7ca866 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCMapDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfCMapDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.h
index 64c2007..88f89c2 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCMapDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCMapDictionary
-#define __DEFINED__SkPdfCMapDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCMapDictionary_DEFINED
+#define SkPdfCMapDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,18 +522,22 @@
   bool has_Type() const;
   SkString CMapName(SkPdfNativeDoc* doc);
   bool has_CMapName() const;
+
   bool isCIDSystemInfoADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getCIDSystemInfoAsDictionary(SkPdfNativeDoc* doc);
+
   bool isCIDSystemInfoAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getCIDSystemInfoAsArray(SkPdfNativeDoc* doc);
   bool has_CIDSystemInfo() const;
   int64_t WMode(SkPdfNativeDoc* doc);
   bool has_WMode() const;
+
   bool isUseCMapAName(SkPdfNativeDoc* doc);
   SkString getUseCMapAsName(SkPdfNativeDoc* doc);
+
   bool isUseCMapAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getUseCMapAsStream(SkPdfNativeDoc* doc);
   bool has_UseCMap() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCMapDictionary
+#endif  // SkPdfCMapDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.cpp
index 357118d..e8c28a9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCalgrayColorSpaceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfCalgrayColorSpaceDictionary::WhitePoint(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("WhitePoint", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.h
index 734842a..37c2b67 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalgrayColorSpaceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCalgrayColorSpaceDictionary
-#define __DEFINED__SkPdfCalgrayColorSpaceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCalgrayColorSpaceDictionary_DEFINED
+#define SkPdfCalgrayColorSpaceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Gamma() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCalgrayColorSpaceDictionary
+#endif  // SkPdfCalgrayColorSpaceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.cpp
index 89dcd48..8583469 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCalrgbColorSpaceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfCalrgbColorSpaceDictionary::WhitePoint(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("WhitePoint", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.h
index fa5aec9..57d72cd 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCalrgbColorSpaceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCalrgbColorSpaceDictionary
-#define __DEFINED__SkPdfCalrgbColorSpaceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCalrgbColorSpaceDictionary_DEFINED
+#define SkPdfCalrgbColorSpaceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Matrix() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCalrgbColorSpaceDictionary
+#endif  // SkPdfCalrgbColorSpaceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.cpp
index 80a68bb..d2261b9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCatalogDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfCatalogDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.h
index a78f89d..6f7e07d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCatalogDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCatalogDictionary
-#define __DEFINED__SkPdfCatalogDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCatalogDictionary_DEFINED
+#define SkPdfCatalogDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,8 +524,10 @@
   bool has_Version() const;
   SkPdfPageTreeNodeDictionary* Pages(SkPdfNativeDoc* doc);
   bool has_Pages() const;
+
   bool isPageLabelsANumber(SkPdfNativeDoc* doc);
   double getPageLabelsAsNumber(SkPdfNativeDoc* doc);
+
   bool isPageLabelsATree(SkPdfNativeDoc* doc);
   SkPdfTree getPageLabelsAsTree(SkPdfNativeDoc* doc);
   bool has_PageLabels() const;
@@ -536,8 +545,10 @@
   bool has_Outlines() const;
   SkPdfArray* Threads(SkPdfNativeDoc* doc);
   bool has_Threads() const;
+
   bool isOpenActionAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getOpenActionAsArray(SkPdfNativeDoc* doc);
+
   bool isOpenActionADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getOpenActionAsDictionary(SkPdfNativeDoc* doc);
   bool has_OpenAction() const;
@@ -561,4 +572,4 @@
   bool has_OutputIntents() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCatalogDictionary
+#endif  // SkPdfCatalogDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp
index 90f7614..14a742f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCcittfaxdecodeFilterDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfCcittfaxdecodeFilterDictionary::K(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("K", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.h
index 5dbc2a1..c0e8d81 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCcittfaxdecodeFilterDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCcittfaxdecodeFilterDictionary
-#define __DEFINED__SkPdfCcittfaxdecodeFilterDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCcittfaxdecodeFilterDictionary_DEFINED
+#define SkPdfCcittfaxdecodeFilterDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -529,4 +536,4 @@
   bool has_DamagedRowsBeforeError() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCcittfaxdecodeFilterDictionary
+#endif  // SkPdfCcittfaxdecodeFilterDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.cpp
index f6d2b52..94bbfd1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfCheckboxFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfCheckboxFieldDictionary::Opt(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Opt", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.h
index d974acf..40544ee 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfCheckboxFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfCheckboxFieldDictionary
-#define __DEFINED__SkPdfCheckboxFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfCheckboxFieldDictionary_DEFINED
+#define SkPdfCheckboxFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Opt() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfCheckboxFieldDictionary
+#endif  // SkPdfCheckboxFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.cpp
index c4b4292..7b940ee 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfChoiceFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfChoiceFieldDictionary::Opt(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Opt", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.h
index 3e38d6b..24c269a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfChoiceFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfChoiceFieldDictionary
-#define __DEFINED__SkPdfChoiceFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfChoiceFieldDictionary_DEFINED
+#define SkPdfChoiceFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_I() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfChoiceFieldDictionary
+#endif  // SkPdfChoiceFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.cpp
index 12128d0..e41c666 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfComponentsWithMetadataDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfStream* SkPdfComponentsWithMetadataDictionary::Metadata(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Metadata", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.h
index 50f487e..4eadaec 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfComponentsWithMetadataDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfComponentsWithMetadataDictionary
-#define __DEFINED__SkPdfComponentsWithMetadataDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfComponentsWithMetadataDictionary_DEFINED
+#define SkPdfComponentsWithMetadataDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Metadata() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfComponentsWithMetadataDictionary
+#endif  // SkPdfComponentsWithMetadataDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.cpp
index ef0af83..ffc9dd1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfDctdecodeFilterDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfDctdecodeFilterDictionary::ColorTransform(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("ColorTransform", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.h
index aa4add0..d7f6509 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDctdecodeFilterDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfDctdecodeFilterDictionary
-#define __DEFINED__SkPdfDctdecodeFilterDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfDctdecodeFilterDictionary_DEFINED
+#define SkPdfDctdecodeFilterDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_ColorTransform() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfDctdecodeFilterDictionary
+#endif  // SkPdfDctdecodeFilterDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.cpp
index 8414deb..6b1c421 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfDeviceNColorSpaceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfDeviceNColorSpaceDictionary::Colorants(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Colorants", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.h
index 775e352..d48eebe 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDeviceNColorSpaceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfDeviceNColorSpaceDictionary
-#define __DEFINED__SkPdfDeviceNColorSpaceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfDeviceNColorSpaceDictionary_DEFINED
+#define SkPdfDeviceNColorSpaceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Colorants() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfDeviceNColorSpaceDictionary
+#endif  // SkPdfDeviceNColorSpaceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.cpp
index 59b62e8..837a10d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.cpp
@@ -1,4 +1,9 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.h
index 488936e..022aff0 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfDictionary
-#define __DEFINED__SkPdfDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfDictionary_DEFINED
+#define SkPdfDictionary_DEFINED
 
 #include "stddef.h"
 #include "SkPdfEnums_autogen.h"
@@ -519,4 +526,4 @@
    bool valid() const {return true;}
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfDictionary
+#endif  // SkPdfDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.cpp
index 9f4c7ea..cedc91c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfDocumentCatalogActionsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfDocumentCatalogActionsDictionary::DC(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("DC", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.h
index 3e6c55c..5be9d76 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentCatalogActionsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfDocumentCatalogActionsDictionary
-#define __DEFINED__SkPdfDocumentCatalogActionsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfDocumentCatalogActionsDictionary_DEFINED
+#define SkPdfDocumentCatalogActionsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -523,4 +530,4 @@
   bool has_DP() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfDocumentCatalogActionsDictionary
+#endif  // SkPdfDocumentCatalogActionsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.cpp
index 026e7ee..99e2796 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfDocumentInformationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfDocumentInformationDictionary::Title(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Title", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.h
index 6b8edb7..db05330 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfDocumentInformationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfDocumentInformationDictionary
-#define __DEFINED__SkPdfDocumentInformationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfDocumentInformationDictionary_DEFINED
+#define SkPdfDocumentInformationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -531,4 +538,4 @@
   bool has_Trapped() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfDocumentInformationDictionary
+#endif  // SkPdfDocumentInformationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.cpp
index 26fa7c2..de573b8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfEmbeddedFileParameterDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfEmbeddedFileParameterDictionary::Size(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Size", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.h
index e1039af..5efd334 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileParameterDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEmbeddedFileParameterDictionary
-#define __DEFINED__SkPdfEmbeddedFileParameterDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEmbeddedFileParameterDictionary_DEFINED
+#define SkPdfEmbeddedFileParameterDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -523,4 +530,4 @@
   bool has_CheckSum() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfEmbeddedFileParameterDictionary
+#endif  // SkPdfEmbeddedFileParameterDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.cpp
index 8a2cf48..91263ef 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfEmbeddedFileStreamDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfEmbeddedFileStreamDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.h
index 9175fe1..05da232 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFileStreamDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEmbeddedFileStreamDictionary
-#define __DEFINED__SkPdfEmbeddedFileStreamDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEmbeddedFileStreamDictionary_DEFINED
+#define SkPdfEmbeddedFileStreamDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Params() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfEmbeddedFileStreamDictionary
+#endif  // SkPdfEmbeddedFileStreamDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.cpp
index 32fb6fb..bfa2c0f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfEmbeddedFontStreamDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfEmbeddedFontStreamDictionary::Length1(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Length1", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.h
index 6f0fe70..58822de 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEmbeddedFontStreamDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEmbeddedFontStreamDictionary
-#define __DEFINED__SkPdfEmbeddedFontStreamDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEmbeddedFontStreamDictionary_DEFINED
+#define SkPdfEmbeddedFontStreamDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -523,4 +530,4 @@
   bool has_Metadata() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfEmbeddedFontStreamDictionary
+#endif  // SkPdfEmbeddedFontStreamDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.cpp
index cc6d7d0..d187408 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfEncodingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfEncodingDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.h
index abd6010..807009c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncodingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEncodingDictionary
-#define __DEFINED__SkPdfEncodingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEncodingDictionary_DEFINED
+#define SkPdfEncodingDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Differences() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfEncodingDictionary
+#endif  // SkPdfEncodingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp
index fab043b..99c5dbb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfEncryptedEmbeddedFileStreamDictionary::EncryptionRevision(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("EncryptionRevision", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h
index af60d70..214c87a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptedEmbeddedFileStreamDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEncryptedEmbeddedFileStreamDictionary
-#define __DEFINED__SkPdfEncryptedEmbeddedFileStreamDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEncryptedEmbeddedFileStreamDictionary_DEFINED
+#define SkPdfEncryptedEmbeddedFileStreamDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_EncryptionRevision() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfEncryptedEmbeddedFileStreamDictionary
+#endif  // SkPdfEncryptedEmbeddedFileStreamDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.cpp
index ebcaaf8..e3cb001 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfEncryptionCommonDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfEncryptionCommonDictionary::Filter(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Filter", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.h
index f938b04..330dd59 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEncryptionCommonDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEncryptionCommonDictionary
-#define __DEFINED__SkPdfEncryptionCommonDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEncryptionCommonDictionary_DEFINED
+#define SkPdfEncryptionCommonDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Length() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfEncryptionCommonDictionary
+#endif  // SkPdfEncryptionCommonDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEnums_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEnums_autogen.h
index dd2a578..fa2d095 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEnums_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfEnums_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfEnums
-#define __DEFINED__SkPdfEnums
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfEnums_DEFINED
+#define SkPdfEnums_DEFINED
 
 enum SkPdfNativeObjectType {
   kNone_SkPdfNativeObjectType = 0,
@@ -348,4 +355,4 @@
 class SkPdfOpiVersionDictionary;
 class SkPdfMultiMasterFontDictionary;
 
-#endif  // __DEFINED__SkPdfEnums
+#endif  // SkPdfEnums_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.cpp
index e4682bb..9dc9779 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFCatalogDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFDFCatalogDictionary::Version(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Version", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.h
index b7d5e77..0d8e27b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFCatalogDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFCatalogDictionary
-#define __DEFINED__SkPdfFDFCatalogDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFCatalogDictionary_DEFINED
+#define SkPdfFDFCatalogDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_FDF() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFCatalogDictionary
+#endif  // SkPdfFDFCatalogDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.cpp
index 70dd48b..9ecab69 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfFileSpec SkPdfFDFDictionary::F(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("F", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.h
index 566471d..1b7a36e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFDictionary
-#define __DEFINED__SkPdfFDFDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFDictionary_DEFINED
+#define SkPdfFDFDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -535,4 +542,4 @@
   bool has_JavaScript() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFDictionary
+#endif  // SkPdfFDFDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.cpp
index 3429742..6428c04 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfFDFFieldDictionary::Kids(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Kids", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.h
index aeaf515..b7f84e5 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFFieldDictionary
-#define __DEFINED__SkPdfFDFFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFFieldDictionary_DEFINED
+#define SkPdfFDFFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -543,4 +550,4 @@
   bool has_AA() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFFieldDictionary
+#endif  // SkPdfFDFFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.cpp
index 65fcc62..f326d12 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFFileAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfFDFFileAnnotationDictionary::Page(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Page", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.h
index bf8e58e..de2a8e8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFFileAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFFileAnnotationDictionary
-#define __DEFINED__SkPdfFDFFileAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFFileAnnotationDictionary_DEFINED
+#define SkPdfFDFFileAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Page() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFFileAnnotationDictionary
+#endif  // SkPdfFDFFileAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp
index f136e2d..2fd62f5 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFNamedPageReferenceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFDFNamedPageReferenceDictionary::Name(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Name", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.h
index 18ac1d7..8090886 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFNamedPageReferenceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFNamedPageReferenceDictionary
-#define __DEFINED__SkPdfFDFNamedPageReferenceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFNamedPageReferenceDictionary_DEFINED
+#define SkPdfFDFNamedPageReferenceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_F() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFNamedPageReferenceDictionary
+#endif  // SkPdfFDFNamedPageReferenceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.cpp
index 7465d84..c5061d9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFPageDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfFDFPageDictionary::Templates(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Templates", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.h
index f0eb6d8..991a006 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFPageDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFPageDictionary
-#define __DEFINED__SkPdfFDFPageDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFPageDictionary_DEFINED
+#define SkPdfFDFPageDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_Info() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFPageDictionary
+#endif  // SkPdfFDFPageDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.cpp
index 8065110..b49a1eb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFTemplateDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfFDFTemplateDictionary::TRef(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("TRef", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.h
index 57d5f2b..bf54d29 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTemplateDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFTemplateDictionary
-#define __DEFINED__SkPdfFDFTemplateDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFTemplateDictionary_DEFINED
+#define SkPdfFDFTemplateDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Rename() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFTemplateDictionary
+#endif  // SkPdfFDFTemplateDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.cpp
index 3274c1f..fb93d25 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFDFTrailerDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfFDFTrailerDictionary::Root(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Root", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.h
index 510dbc9..cfbdc3d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFDFTrailerDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFDFTrailerDictionary
-#define __DEFINED__SkPdfFDFTrailerDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFDFTrailerDictionary_DEFINED
+#define SkPdfFDFTrailerDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Root() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFDFTrailerDictionary
+#endif  // SkPdfFDFTrailerDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.cpp
index 89fda70..f9c42b6 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFieldDictionary::FT(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("FT", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.h
index ebe265f..5ac03a2 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFieldDictionary
-#define __DEFINED__SkPdfFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFieldDictionary_DEFINED
+#define SkPdfFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -533,4 +540,4 @@
   bool has_AA() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFieldDictionary
+#endif  // SkPdfFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp
index bd131bf..e274e14 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFileAttachmentAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFileAttachmentAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.h
index 619207d..031136f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileAttachmentAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFileAttachmentAnnotationDictionary
-#define __DEFINED__SkPdfFileAttachmentAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFileAttachmentAnnotationDictionary_DEFINED
+#define SkPdfFileAttachmentAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Name() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFileAttachmentAnnotationDictionary
+#endif  // SkPdfFileAttachmentAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.cpp
index 4656675..d321dd4 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFileSpecificationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFileSpecificationDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.h
index dd69b34..f040116 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileSpecificationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFileSpecificationDictionary
-#define __DEFINED__SkPdfFileSpecificationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFileSpecificationDictionary_DEFINED
+#define SkPdfFileSpecificationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -533,4 +540,4 @@
   bool has_RF() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFileSpecificationDictionary
+#endif  // SkPdfFileSpecificationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.cpp
index 1268489..a74d056 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFileTrailerDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfFileTrailerDictionary::Size(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Size", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.h
index 101b4a2..4e9fd67 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFileTrailerDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFileTrailerDictionary
-#define __DEFINED__SkPdfFileTrailerDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFileTrailerDictionary_DEFINED
+#define SkPdfFileTrailerDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_ID() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFileTrailerDictionary
+#endif  // SkPdfFileTrailerDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.cpp
index b6b5311..0d65784 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFontDescriptorDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFontDescriptorDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.h
index b05d5d2..7225f8b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDescriptorDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFontDescriptorDictionary
-#define __DEFINED__SkPdfFontDescriptorDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFontDescriptorDictionary_DEFINED
+#define SkPdfFontDescriptorDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -551,4 +558,4 @@
   bool has_CharSet() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFontDescriptorDictionary
+#endif  // SkPdfFontDescriptorDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.cpp
index df6af99..45963b0 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.cpp
@@ -1,4 +1,9 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.h
index fedffcd..5247378 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFontDictionary
-#define __DEFINED__SkPdfFontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFontDictionary_DEFINED
+#define SkPdfFontDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -497,4 +504,4 @@
    bool valid() const {return true;}
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFontDictionary
+#endif  // SkPdfFontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.cpp
index 86af890..86b89c7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFormFieldActionsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfFormFieldActionsDictionary::K(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("K", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.h
index c61a870..bf1effb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFormFieldActionsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFormFieldActionsDictionary
-#define __DEFINED__SkPdfFormFieldActionsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFormFieldActionsDictionary_DEFINED
+#define SkPdfFormFieldActionsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_C() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFormFieldActionsDictionary
+#endif  // SkPdfFormFieldActionsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.cpp
index 8d64924..db5fefd 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFreeTextAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfFreeTextAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.h
index 09dca62..ff36b94 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFreeTextAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFreeTextAnnotationDictionary
-#define __DEFINED__SkPdfFreeTextAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFreeTextAnnotationDictionary_DEFINED
+#define SkPdfFreeTextAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Q() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFreeTextAnnotationDictionary
+#endif  // SkPdfFreeTextAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.cpp
index 1117f2c..50368fa 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfFunctionCommonDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfFunctionCommonDictionary::FunctionType(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("FunctionType", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.h
index d281047..f4458a3 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfFunctionCommonDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfFunctionCommonDictionary
-#define __DEFINED__SkPdfFunctionCommonDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfFunctionCommonDictionary_DEFINED
+#define SkPdfFunctionCommonDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Range() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfFunctionCommonDictionary
+#endif  // SkPdfFunctionCommonDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.cpp
index 727f76e..f35b061 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfGoToActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfGoToActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.h
index 1231930..ced3918 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGoToActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfGoToActionDictionary
-#define __DEFINED__SkPdfGoToActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfGoToActionDictionary_DEFINED
+#define SkPdfGoToActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,13 +520,16 @@
    bool valid() const {return true;}
   SkString S(SkPdfNativeDoc* doc);
   bool has_S() const;
+
   bool isDAName(SkPdfNativeDoc* doc);
   SkString getDAsName(SkPdfNativeDoc* doc);
+
   bool isDAString(SkPdfNativeDoc* doc);
   SkString getDAsString(SkPdfNativeDoc* doc);
+
   bool isDAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getDAsArray(SkPdfNativeDoc* doc);
   bool has_D() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfGoToActionDictionary
+#endif  // SkPdfGoToActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.cpp
index 7f0a214..de5c8c1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfGraphicsStateDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfGraphicsStateDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.h
index 6777022..091ef40 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGraphicsStateDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfGraphicsStateDictionary
-#define __DEFINED__SkPdfGraphicsStateDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfGraphicsStateDictionary_DEFINED
+#define SkPdfGraphicsStateDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -535,36 +542,49 @@
   bool has_Font() const;
   SkPdfFunction BG(SkPdfNativeDoc* doc);
   bool has_BG() const;
+
   bool isBG2AFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getBG2AsFunction(SkPdfNativeDoc* doc);
+
   bool isBG2AName(SkPdfNativeDoc* doc);
   SkString getBG2AsName(SkPdfNativeDoc* doc);
   bool has_BG2() const;
   SkPdfFunction UCR(SkPdfNativeDoc* doc);
   bool has_UCR() const;
+
   bool isUCR2AFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getUCR2AsFunction(SkPdfNativeDoc* doc);
+
   bool isUCR2AName(SkPdfNativeDoc* doc);
   SkString getUCR2AsName(SkPdfNativeDoc* doc);
   bool has_UCR2() const;
+
   bool isTRAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTRAsFunction(SkPdfNativeDoc* doc);
+
   bool isTRAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getTRAsArray(SkPdfNativeDoc* doc);
+
   bool isTRAName(SkPdfNativeDoc* doc);
   SkString getTRAsName(SkPdfNativeDoc* doc);
   bool has_TR() const;
+
   bool isTR2AFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTR2AsFunction(SkPdfNativeDoc* doc);
+
   bool isTR2AArray(SkPdfNativeDoc* doc);
   SkPdfArray* getTR2AsArray(SkPdfNativeDoc* doc);
+
   bool isTR2AName(SkPdfNativeDoc* doc);
   SkString getTR2AsName(SkPdfNativeDoc* doc);
   bool has_TR2() const;
+
   bool isHTADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getHTAsDictionary(SkPdfNativeDoc* doc);
+
   bool isHTAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getHTAsStream(SkPdfNativeDoc* doc);
+
   bool isHTAName(SkPdfNativeDoc* doc);
   SkString getHTAsName(SkPdfNativeDoc* doc);
   bool has_HT() const;
@@ -574,13 +594,17 @@
   bool has_SM() const;
   bool SA(SkPdfNativeDoc* doc);
   bool has_SA() const;
+
   bool isBMAName(SkPdfNativeDoc* doc);
   SkString getBMAsName(SkPdfNativeDoc* doc);
+
   bool isBMAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getBMAsArray(SkPdfNativeDoc* doc);
   bool has_BM() const;
+
   bool isSMaskADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getSMaskAsDictionary(SkPdfNativeDoc* doc);
+
   bool isSMaskAName(SkPdfNativeDoc* doc);
   SkString getSMaskAsName(SkPdfNativeDoc* doc);
   bool has_SMask() const;
@@ -594,4 +618,4 @@
   bool has_TK() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfGraphicsStateDictionary
+#endif  // SkPdfGraphicsStateDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.cpp
index 35a2c30..e7cbcdb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfGroupAttributesDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfGroupAttributesDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.h
index cffa246..a402a91 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfGroupAttributesDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfGroupAttributesDictionary
-#define __DEFINED__SkPdfGroupAttributesDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfGroupAttributesDictionary_DEFINED
+#define SkPdfGroupAttributesDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_S() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfGroupAttributesDictionary
+#endif  // SkPdfGroupAttributesDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.cpp
index 07b707d..aeece4b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfHeaders_autogen.h"
 #include "SkPdfJavascriptActionDictionary_autogen.cpp"
 #include "SkPdfMovieAnnotationDictionary_autogen.cpp"
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.h
index 25361a3..7ddfc09 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHeaders_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfHeaders
-#define __DEFINED__SkPdfHeaders
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfHeaders_DEFINED
+#define SkPdfHeaders_DEFINED
 
 #include "SkPdfJavascriptActionDictionary_autogen.h"
 #include "SkPdfMovieAnnotationDictionary_autogen.h"
@@ -169,4 +176,4 @@
 #include "SkPdfType0FunctionDictionary_autogen.h"
 #include "SkPdfFDFPageDictionary_autogen.h"
 #include "SkPdfCalrgbColorSpaceDictionary_autogen.h"
-#endif  // __DEFINED__SkPdfHeaders
+#endif  // SkPdfHeaders_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.cpp
index f10e562..a03ca3b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfHideActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfHideActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.h
index e944f3b..832e42e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfHideActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfHideActionDictionary
-#define __DEFINED__SkPdfHideActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfHideActionDictionary_DEFINED
+#define SkPdfHideActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,10 +520,13 @@
    bool valid() const {return true;}
   SkString S(SkPdfNativeDoc* doc);
   bool has_S() const;
+
   bool isTADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getTAsDictionary(SkPdfNativeDoc* doc);
+
   bool isTAString(SkPdfNativeDoc* doc);
   SkString getTAsString(SkPdfNativeDoc* doc);
+
   bool isTAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getTAsArray(SkPdfNativeDoc* doc);
   bool has_T() const;
@@ -524,4 +534,4 @@
   bool has_H() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfHideActionDictionary
+#endif  // SkPdfHideActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.cpp
index 6ee6312..5fc2154 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfIccProfileStreamDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfIccProfileStreamDictionary::N(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("N", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.h
index c0a997b..c6a2339 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIccProfileStreamDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfIccProfileStreamDictionary
-#define __DEFINED__SkPdfIccProfileStreamDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfIccProfileStreamDictionary_DEFINED
+#define SkPdfIccProfileStreamDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,8 +520,10 @@
    bool valid() const {return true;}
   int64_t N(SkPdfNativeDoc* doc);
   bool has_N() const;
+
   bool isAlternateAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getAlternateAsArray(SkPdfNativeDoc* doc);
+
   bool isAlternateAName(SkPdfNativeDoc* doc);
   SkString getAlternateAsName(SkPdfNativeDoc* doc);
   bool has_Alternate() const;
@@ -524,4 +533,4 @@
   bool has_Metadata() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfIccProfileStreamDictionary
+#endif  // SkPdfIccProfileStreamDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.cpp
index ec3ed29..75def31 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfIconFitDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfIconFitDictionary::SW(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("SW", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.h
index 6b1a9f8..d9fab7b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfIconFitDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfIconFitDictionary
-#define __DEFINED__SkPdfIconFitDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfIconFitDictionary_DEFINED
+#define SkPdfIconFitDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_A() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfIconFitDictionary
+#endif  // SkPdfIconFitDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.cpp
index 5e70663..e142a78 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfImageDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfImageDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.h
index 2ea5735..322ca01 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImageDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfImageDictionary
-#define __DEFINED__SkPdfImageDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfImageDictionary_DEFINED
+#define SkPdfImageDictionary_DEFINED
 
 #include "SkPdfXObjectDictionary_autogen.h"
 
@@ -24,8 +31,10 @@
   bool has_Width() const;
   int64_t Height(SkPdfNativeDoc* doc);
   bool has_Height() const;
+
   bool isColorSpaceAName(SkPdfNativeDoc* doc);
   SkString getColorSpaceAsName(SkPdfNativeDoc* doc);
+
   bool isColorSpaceAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getColorSpaceAsArray(SkPdfNativeDoc* doc);
   bool has_ColorSpace() const;
@@ -35,8 +44,10 @@
   bool has_Intent() const;
   bool ImageMask(SkPdfNativeDoc* doc);
   bool has_ImageMask() const;
+
   bool isMaskAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getMaskAsStream(SkPdfNativeDoc* doc);
+
   bool isMaskAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getMaskAsArray(SkPdfNativeDoc* doc);
   bool has_Mask() const;
@@ -60,4 +71,4 @@
   bool has_Metadata() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfImageDictionary
+#endif  // SkPdfImageDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.cpp
index 6195b5d..3f47eb8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfImportDataActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfImportDataActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.h
index 32bc1a7..88f2e57 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfImportDataActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfImportDataActionDictionary
-#define __DEFINED__SkPdfImportDataActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfImportDataActionDictionary_DEFINED
+#define SkPdfImportDataActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_F() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfImportDataActionDictionary
+#endif  // SkPdfImportDataActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.cpp
index 3310164..069ac29 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfInkAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfInkAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.h
index 3807223..e3b1b85 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInkAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfInkAnnotationDictionary
-#define __DEFINED__SkPdfInkAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfInkAnnotationDictionary_DEFINED
+#define SkPdfInkAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_BS() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfInkAnnotationDictionary
+#endif  // SkPdfInkAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp
index 1a6f8e5..788459d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfInlineLevelStructureElementsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfInlineLevelStructureElementsDictionary::isLineHeightANumber(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("LineHeight", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.h
index b8966ca..13770c0 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInlineLevelStructureElementsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfInlineLevelStructureElementsDictionary
-#define __DEFINED__SkPdfInlineLevelStructureElementsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfInlineLevelStructureElementsDictionary_DEFINED
+#define SkPdfInlineLevelStructureElementsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -511,11 +518,13 @@
 
 public:
    bool valid() const {return true;}
+
   bool isLineHeightANumber(SkPdfNativeDoc* doc);
   double getLineHeightAsNumber(SkPdfNativeDoc* doc);
+
   bool isLineHeightAName(SkPdfNativeDoc* doc);
   SkString getLineHeightAsName(SkPdfNativeDoc* doc);
   bool has_LineHeight() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfInlineLevelStructureElementsDictionary
+#endif  // SkPdfInlineLevelStructureElementsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.cpp
index ca55ae3..880355e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfInteractiveFormDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfInteractiveFormDictionary::Fields(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Fields", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.h
index 452edca..0e3a536 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfInteractiveFormDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfInteractiveFormDictionary
-#define __DEFINED__SkPdfInteractiveFormDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfInteractiveFormDictionary_DEFINED
+#define SkPdfInteractiveFormDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -527,4 +534,4 @@
   bool has_Q() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfInteractiveFormDictionary
+#endif  // SkPdfInteractiveFormDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.cpp
index 1f057e6..7ec8567 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfJavascriptActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfJavascriptActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.h
index 0742828..5c32412 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfJavascriptActionDictionary
-#define __DEFINED__SkPdfJavascriptActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfJavascriptActionDictionary_DEFINED
+#define SkPdfJavascriptActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,11 +520,13 @@
    bool valid() const {return true;}
   SkString S(SkPdfNativeDoc* doc);
   bool has_S() const;
+
   bool isJSAString(SkPdfNativeDoc* doc);
   SkString getJSAsString(SkPdfNativeDoc* doc);
+
   bool isJSAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getJSAsStream(SkPdfNativeDoc* doc);
   bool has_JS() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfJavascriptActionDictionary
+#endif  // SkPdfJavascriptActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.cpp
index b3c0917..c90c44d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfJavascriptDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfJavascriptDictionary::isBeforeAString(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Before", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.h
index 551939b..a53363f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJavascriptDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfJavascriptDictionary
-#define __DEFINED__SkPdfJavascriptDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfJavascriptDictionary_DEFINED
+#define SkPdfJavascriptDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -511,13 +518,17 @@
 
 public:
    bool valid() const {return true;}
+
   bool isBeforeAString(SkPdfNativeDoc* doc);
   SkString getBeforeAsString(SkPdfNativeDoc* doc);
+
   bool isBeforeAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getBeforeAsStream(SkPdfNativeDoc* doc);
   bool has_Before() const;
+
   bool isAfterAString(SkPdfNativeDoc* doc);
   SkString getAfterAsString(SkPdfNativeDoc* doc);
+
   bool isAfterAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getAfterAsStream(SkPdfNativeDoc* doc);
   bool has_After() const;
@@ -525,4 +536,4 @@
   bool has_Doc() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfJavascriptDictionary
+#endif  // SkPdfJavascriptDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.cpp
index 43c0fa5..8239e3a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfJbig2DecodeFilterDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfStream* SkPdfJbig2DecodeFilterDictionary::JBIG2Globals(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("JBIG2Globals", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.h
index 30a22bb..9630832 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfJbig2DecodeFilterDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfJbig2DecodeFilterDictionary
-#define __DEFINED__SkPdfJbig2DecodeFilterDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfJbig2DecodeFilterDictionary_DEFINED
+#define SkPdfJbig2DecodeFilterDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_JBIG2Globals() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfJbig2DecodeFilterDictionary
+#endif  // SkPdfJbig2DecodeFilterDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.cpp
index b5e5c21..9cf09ec 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfLabColorSpaceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfLabColorSpaceDictionary::WhitePoint(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("WhitePoint", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.h
index 96cccc5..abc6451 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLabColorSpaceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfLabColorSpaceDictionary
-#define __DEFINED__SkPdfLabColorSpaceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfLabColorSpaceDictionary_DEFINED
+#define SkPdfLabColorSpaceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Range() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfLabColorSpaceDictionary
+#endif  // SkPdfLabColorSpaceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.cpp
index b5d2ff6..5bd2701 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfLaunchActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfLaunchActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.h
index 64513d1..61a80e8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLaunchActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfLaunchActionDictionary
-#define __DEFINED__SkPdfLaunchActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfLaunchActionDictionary_DEFINED
+#define SkPdfLaunchActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_NewWindow() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfLaunchActionDictionary
+#endif  // SkPdfLaunchActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.cpp
index 9d1ca37..8d710ad 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfLineAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfLineAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.h
index e238878..61a860e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLineAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfLineAnnotationDictionary
-#define __DEFINED__SkPdfLineAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfLineAnnotationDictionary_DEFINED
+#define SkPdfLineAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_IC() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfLineAnnotationDictionary
+#endif  // SkPdfLineAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.cpp
index d411d71..1e4ff0e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfListAttributeDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfListAttributeDictionary::ListNumbering(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("ListNumbering", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.h
index 7f5269f..18fbe57 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfListAttributeDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfListAttributeDictionary
-#define __DEFINED__SkPdfListAttributeDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfListAttributeDictionary_DEFINED
+#define SkPdfListAttributeDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_ListNumbering() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfListAttributeDictionary
+#endif  // SkPdfListAttributeDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp
index 77efac8..35f4c44 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfLzwdecodeAndFlatedecodeFiltersDictionary::Predictor(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Predictor", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h
index 6b3cad0..d66d7a2 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfLzwdecodeAndFlatedecodeFiltersDictionary
-#define __DEFINED__SkPdfLzwdecodeAndFlatedecodeFiltersDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_DEFINED
+#define SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -523,4 +530,4 @@
   bool has_EarlyChange() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfLzwdecodeAndFlatedecodeFiltersDictionary
+#endif  // SkPdfLzwdecodeAndFlatedecodeFiltersDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.cpp
index f27b6f3..e6903c9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMacOsFileInformationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMacOsFileInformationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.h
index f270a14..99aad27 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMacOsFileInformationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMacOsFileInformationDictionary
-#define __DEFINED__SkPdfMacOsFileInformationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMacOsFileInformationDictionary_DEFINED
+#define SkPdfMacOsFileInformationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_ResFork() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMacOsFileInformationDictionary
+#endif  // SkPdfMacOsFileInformationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.cpp
index eea361f..bfdc67d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.cpp
@@ -1,3 +1,10 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMapper_autogen.h"
 #include "SkPdfUtils.h"
 #include "SkPdfNativeObject.h"
@@ -4625,3 +4632,4 @@
   if (abr == NULL || *abr == '\0') return false;
   return SkPdfMultiMasterFontDictionaryFromDictionary(dict, abr, data);
 }
+
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.h
index c762a5d..7ddcb24 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMapper_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMapper
-#define __DEFINED__SkPdfMapper
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMapper_DEFINED
+#define SkPdfMapper_DEFINED
 
 #include "SkPdfHeaders_autogen.h"
 #include "SkPdfNativeDoc.h"
@@ -682,4 +689,4 @@
   bool SkPdfMultiMasterFontDictionaryFromDictionary(const SkPdfNativeObject* dict, const char* key, const char* abr, SkPdfMultiMasterFontDictionary** data) const ;
 };
 
-#endif  // __DEFINED__SkPdfMapper
+#endif  // SkPdfMapper_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.cpp
index 8779cb0..a95a167 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMarkInformationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfMarkInformationDictionary::Marked(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Marked", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.h
index 5dba24f..8396f11 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkInformationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMarkInformationDictionary
-#define __DEFINED__SkPdfMarkInformationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMarkInformationDictionary_DEFINED
+#define SkPdfMarkInformationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Marked() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMarkInformationDictionary
+#endif  // SkPdfMarkInformationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.cpp
index fdd2574..c3e021b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMarkedContentReferenceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMarkedContentReferenceDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.h
index bbf1562..34bd34c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkedContentReferenceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMarkedContentReferenceDictionary
-#define __DEFINED__SkPdfMarkedContentReferenceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMarkedContentReferenceDictionary_DEFINED
+#define SkPdfMarkedContentReferenceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -523,4 +530,4 @@
   bool has_MCID() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMarkedContentReferenceDictionary
+#endif  // SkPdfMarkedContentReferenceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.cpp
index ca29775..634932b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMarkupAnnotationsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMarkupAnnotationsDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.h
index ee6cfea..c1d358b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMarkupAnnotationsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMarkupAnnotationsDictionary
-#define __DEFINED__SkPdfMarkupAnnotationsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMarkupAnnotationsDictionary_DEFINED
+#define SkPdfMarkupAnnotationsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_QuadPoints() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMarkupAnnotationsDictionary
+#endif  // SkPdfMarkupAnnotationsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.cpp
index 6ff83d4..0ab9b9a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMetadataStreamDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMetadataStreamDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.h
index 6b5c302..bc7bc1d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMetadataStreamDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMetadataStreamDictionary
-#define __DEFINED__SkPdfMetadataStreamDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMetadataStreamDictionary_DEFINED
+#define SkPdfMetadataStreamDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_Subtype() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMetadataStreamDictionary
+#endif  // SkPdfMetadataStreamDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.cpp
index 4c2dade..bfc7771 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMovieActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMovieActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.h
index ad266b2..ad47cd4 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMovieActionDictionary
-#define __DEFINED__SkPdfMovieActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMovieActionDictionary_DEFINED
+#define SkPdfMovieActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Operation() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMovieActionDictionary
+#endif  // SkPdfMovieActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.cpp
index 1578213..b8ee367 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMovieActivationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfNativeObject* SkPdfMovieActivationDictionary::Start(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Start", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.h
index d5da3ff..787a7c9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieActivationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMovieActivationDictionary
-#define __DEFINED__SkPdfMovieActivationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMovieActivationDictionary_DEFINED
+#define SkPdfMovieActivationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -531,4 +538,4 @@
   bool has_FWPosition() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMovieActivationDictionary
+#endif  // SkPdfMovieActivationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.cpp
index b40973d..5b7e08c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMovieAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMovieAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.h
index b9308ba..c53ee09 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMovieAnnotationDictionary
-#define __DEFINED__SkPdfMovieAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMovieAnnotationDictionary_DEFINED
+#define SkPdfMovieAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,11 +524,13 @@
   bool has_Movie() const;
   SkString Contents(SkPdfNativeDoc* doc);
   bool has_Contents() const;
+
   bool isAABoolean(SkPdfNativeDoc* doc);
   bool getAAsBoolean(SkPdfNativeDoc* doc);
+
   bool isAADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getAAsDictionary(SkPdfNativeDoc* doc);
   bool has_A() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMovieAnnotationDictionary
+#endif  // SkPdfMovieAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.cpp
index d28e7f5..a1f4831 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMovieDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfFileSpec SkPdfMovieDictionary::F(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("F", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.h
index 8d0537a..58aa9cb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMovieDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMovieDictionary
-#define __DEFINED__SkPdfMovieDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMovieDictionary_DEFINED
+#define SkPdfMovieDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,11 +524,13 @@
   bool has_Aspect() const;
   int64_t Rotate(SkPdfNativeDoc* doc);
   bool has_Rotate() const;
+
   bool isPosterABoolean(SkPdfNativeDoc* doc);
   bool getPosterAsBoolean(SkPdfNativeDoc* doc);
+
   bool isPosterAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getPosterAsStream(SkPdfNativeDoc* doc);
   bool has_Poster() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMovieDictionary
+#endif  // SkPdfMovieDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.cpp
index a0c1f8e..71afef1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfMultiMasterFontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfMultiMasterFontDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.h
index a1884c8..99ae6a3 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfMultiMasterFontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfMultiMasterFontDictionary
-#define __DEFINED__SkPdfMultiMasterFontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfMultiMasterFontDictionary_DEFINED
+#define SkPdfMultiMasterFontDictionary_DEFINED
 
 #include "SkPdfType1FontDictionary_autogen.h"
 
@@ -22,4 +29,4 @@
   bool has_Subtype() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfMultiMasterFontDictionary
+#endif  // SkPdfMultiMasterFontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.cpp
index 8f86a92..4db47a4 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfNameDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfNameDictionary::isDestsAName(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Dests", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.h
index 94e87e2..bcce582 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfNameDictionary
-#define __DEFINED__SkPdfNameDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNameDictionary_DEFINED
+#define SkPdfNameDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -511,46 +518,62 @@
 
 public:
    bool valid() const {return true;}
+
   bool isDestsAName(SkPdfNativeDoc* doc);
   SkString getDestsAsName(SkPdfNativeDoc* doc);
+
   bool isDestsATree(SkPdfNativeDoc* doc);
   SkPdfTree getDestsAsTree(SkPdfNativeDoc* doc);
   bool has_Dests() const;
+
   bool isAPAName(SkPdfNativeDoc* doc);
   SkString getAPAsName(SkPdfNativeDoc* doc);
+
   bool isAPATree(SkPdfNativeDoc* doc);
   SkPdfTree getAPAsTree(SkPdfNativeDoc* doc);
   bool has_AP() const;
+
   bool isJavaScriptAName(SkPdfNativeDoc* doc);
   SkString getJavaScriptAsName(SkPdfNativeDoc* doc);
+
   bool isJavaScriptATree(SkPdfNativeDoc* doc);
   SkPdfTree getJavaScriptAsTree(SkPdfNativeDoc* doc);
   bool has_JavaScript() const;
+
   bool isPagesAName(SkPdfNativeDoc* doc);
   SkString getPagesAsName(SkPdfNativeDoc* doc);
+
   bool isPagesATree(SkPdfNativeDoc* doc);
   SkPdfTree getPagesAsTree(SkPdfNativeDoc* doc);
   bool has_Pages() const;
+
   bool isTemplatesAName(SkPdfNativeDoc* doc);
   SkString getTemplatesAsName(SkPdfNativeDoc* doc);
+
   bool isTemplatesATree(SkPdfNativeDoc* doc);
   SkPdfTree getTemplatesAsTree(SkPdfNativeDoc* doc);
   bool has_Templates() const;
+
   bool isIDSAName(SkPdfNativeDoc* doc);
   SkString getIDSAsName(SkPdfNativeDoc* doc);
+
   bool isIDSATree(SkPdfNativeDoc* doc);
   SkPdfTree getIDSAsTree(SkPdfNativeDoc* doc);
   bool has_IDS() const;
+
   bool isURLSAName(SkPdfNativeDoc* doc);
   SkString getURLSAsName(SkPdfNativeDoc* doc);
+
   bool isURLSATree(SkPdfNativeDoc* doc);
   SkPdfTree getURLSAsTree(SkPdfNativeDoc* doc);
   bool has_URLS() const;
+
   bool isEmbeddedFilesAName(SkPdfNativeDoc* doc);
   SkString getEmbeddedFilesAsName(SkPdfNativeDoc* doc);
+
   bool isEmbeddedFilesATree(SkPdfNativeDoc* doc);
   SkPdfTree getEmbeddedFilesAsTree(SkPdfNativeDoc* doc);
   bool has_EmbeddedFiles() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfNameDictionary
+#endif  // SkPdfNameDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.cpp
index 6eed3b2..f781580 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfNameTreeNodeDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfNameTreeNodeDictionary::Kids(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Kids", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.h
index 8800c5d..1f4d384 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNameTreeNodeDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfNameTreeNodeDictionary
-#define __DEFINED__SkPdfNameTreeNodeDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNameTreeNodeDictionary_DEFINED
+#define SkPdfNameTreeNodeDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Limits() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfNameTreeNodeDictionary
+#endif  // SkPdfNameTreeNodeDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.cpp
index 3c348d8..d7ea748 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfNamedActionsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfNamedActionsDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.h
index 8d655bd..132ce23 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNamedActionsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfNamedActionsDictionary
-#define __DEFINED__SkPdfNamedActionsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNamedActionsDictionary_DEFINED
+#define SkPdfNamedActionsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_N() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfNamedActionsDictionary
+#endif  // SkPdfNamedActionsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.cpp
index 0610e21..d80b9ff 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfNumberTreeNodeDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfNumberTreeNodeDictionary::Kids(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Kids", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.h
index 325ab0f..f76cc86 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfNumberTreeNodeDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfNumberTreeNodeDictionary
-#define __DEFINED__SkPdfNumberTreeNodeDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfNumberTreeNodeDictionary_DEFINED
+#define SkPdfNumberTreeNodeDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Limits() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfNumberTreeNodeDictionary
+#endif  // SkPdfNumberTreeNodeDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.cpp
index 2a1c4b1..2db98a4 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfObjectReferenceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfObjectReferenceDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.h
index 5b40946..02b69bf 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfObjectReferenceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfObjectReferenceDictionary
-#define __DEFINED__SkPdfObjectReferenceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfObjectReferenceDictionary_DEFINED
+#define SkPdfObjectReferenceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Obj() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfObjectReferenceDictionary
+#endif  // SkPdfObjectReferenceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.cpp
index fa5c62c..ff08cf8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfOpiVersionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfOpiVersionDictionary::version_number(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("version_number", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.h
index 5497996..49db23b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOpiVersionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfOpiVersionDictionary
-#define __DEFINED__SkPdfOpiVersionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfOpiVersionDictionary_DEFINED
+#define SkPdfOpiVersionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_version_number() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfOpiVersionDictionary
+#endif  // SkPdfOpiVersionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.cpp
index 0050d49..ea7ae47 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfOutlineDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfOutlineDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.h
index a45c821..a25c12b3 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfOutlineDictionary
-#define __DEFINED__SkPdfOutlineDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfOutlineDictionary_DEFINED
+#define SkPdfOutlineDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Count() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfOutlineDictionary
+#endif  // SkPdfOutlineDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.cpp
index 6976443..62a87a8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfOutlineItemDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfOutlineItemDictionary::Title(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Title", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.h
index 60a666c..e2158a7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfOutlineItemDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfOutlineItemDictionary
-#define __DEFINED__SkPdfOutlineItemDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfOutlineItemDictionary_DEFINED
+#define SkPdfOutlineItemDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,10 +532,13 @@
   bool has_Last() const;
   int64_t Count(SkPdfNativeDoc* doc);
   bool has_Count() const;
+
   bool isDestAName(SkPdfNativeDoc* doc);
   SkString getDestAsName(SkPdfNativeDoc* doc);
+
   bool isDestAString(SkPdfNativeDoc* doc);
   SkString getDestAsString(SkPdfNativeDoc* doc);
+
   bool isDestAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getDestAsArray(SkPdfNativeDoc* doc);
   bool has_Dest() const;
@@ -542,4 +552,4 @@
   bool has_F() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfOutlineItemDictionary
+#endif  // SkPdfOutlineItemDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.cpp
index 26d2e7c..af16355 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPDF_XOutputIntentDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPDF_XOutputIntentDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.h
index 7c01fcf..52c1416 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPDF_XOutputIntentDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPDF_XOutputIntentDictionary
-#define __DEFINED__SkPdfPDF_XOutputIntentDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPDF_XOutputIntentDictionary_DEFINED
+#define SkPdfPDF_XOutputIntentDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -527,4 +534,4 @@
   bool has_DestOutputProfile() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPDF_XOutputIntentDictionary
+#endif  // SkPdfPDF_XOutputIntentDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.cpp
index d4dd900..8677c35 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPSXobjectDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPSXobjectDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.h
index 521f694..17fc3de 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPSXobjectDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPSXobjectDictionary
-#define __DEFINED__SkPdfPSXobjectDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPSXobjectDictionary_DEFINED
+#define SkPdfPSXobjectDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Level1() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPSXobjectDictionary
+#endif  // SkPdfPSXobjectDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.cpp
index 78c1dee..8c099fe 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPageLabelDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPageLabelDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.h
index 780ba3b..b29d7aa 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageLabelDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPageLabelDictionary
-#define __DEFINED__SkPdfPageLabelDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPageLabelDictionary_DEFINED
+#define SkPdfPageLabelDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_St() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPageLabelDictionary
+#endif  // SkPdfPageLabelDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.cpp
index cae73bd..1c98621 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPageObjectActionsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfPageObjectActionsDictionary::O(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("O", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.h
index 4473527..7239345 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectActionsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPageObjectActionsDictionary
-#define __DEFINED__SkPdfPageObjectActionsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPageObjectActionsDictionary_DEFINED
+#define SkPdfPageObjectActionsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_C() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPageObjectActionsDictionary
+#endif  // SkPdfPageObjectActionsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.cpp
index 12e9380..73bf56e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPageObjectDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPageObjectDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.h
index 1088132..f6fed5a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageObjectDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPageObjectDictionary
-#define __DEFINED__SkPdfPageObjectDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPageObjectDictionary_DEFINED
+#define SkPdfPageObjectDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -531,8 +538,10 @@
   bool has_ArtBox() const;
   SkPdfDictionary* BoxColorInfo(SkPdfNativeDoc* doc);
   bool has_BoxColorInfo() const;
+
   bool isContentsAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getContentsAsStream(SkPdfNativeDoc* doc);
+
   bool isContentsAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getContentsAsArray(SkPdfNativeDoc* doc);
   bool has_Contents() const;
@@ -566,4 +575,4 @@
   bool has_SeparationInfo() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPageObjectDictionary
+#endif  // SkPdfPageObjectDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.cpp
index b163222..df6ab1b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.cpp
@@ -1,8 +1,14 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPagePieceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
 /*
+
 SkPdfDictionary* SkPdfPagePieceDictionary::[any_application_name_or_well_known_data_type](SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("[any_application_name_or_well_known_data_type]", "");
   if (doc) {ret = doc->resolveReference(ret);}
@@ -14,5 +20,4 @@
 bool SkPdfPagePieceDictionary::has_[any_application_name_or_well_known_data_type]() const {
   return get("[any_application_name_or_well_known_data_type]", "") != NULL;
 }
-
 */
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.h
index cfc2ca0..83088b1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPagePieceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPagePieceDictionary
-#define __DEFINED__SkPdfPagePieceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPagePieceDictionary_DEFINED
+#define SkPdfPagePieceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
 */
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPagePieceDictionary
+#endif  // SkPdfPagePieceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.cpp
index ed136ff..c0f179e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPageTreeNodeDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPageTreeNodeDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.h
index 0840f70..3031394 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPageTreeNodeDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPageTreeNodeDictionary
-#define __DEFINED__SkPdfPageTreeNodeDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPageTreeNodeDictionary_DEFINED
+#define SkPdfPageTreeNodeDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Count() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPageTreeNodeDictionary
+#endif  // SkPdfPageTreeNodeDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.cpp
index 33027a3..1c7e16b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPopUpAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPopUpAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.h
index 945cd68..4902322 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPopUpAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPopUpAnnotationDictionary
-#define __DEFINED__SkPdfPopUpAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPopUpAnnotationDictionary_DEFINED
+#define SkPdfPopUpAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Open() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPopUpAnnotationDictionary
+#endif  // SkPdfPopUpAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp
index ce8824c..fa10c43 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPrinterMarkAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPrinterMarkAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.h
index 8b4f8b6..08ad942 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPrinterMarkAnnotationDictionary
-#define __DEFINED__SkPdfPrinterMarkAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPrinterMarkAnnotationDictionary_DEFINED
+#define SkPdfPrinterMarkAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_MN() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPrinterMarkAnnotationDictionary
+#endif  // SkPdfPrinterMarkAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.cpp
index bf53e7c..7d8937e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfPrinterMarkFormDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfPrinterMarkFormDictionary::MarkStyle(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("MarkStyle", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.h
index 9613419..15b46df 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfPrinterMarkFormDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfPrinterMarkFormDictionary
-#define __DEFINED__SkPdfPrinterMarkFormDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfPrinterMarkFormDictionary_DEFINED
+#define SkPdfPrinterMarkFormDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_Colorants() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfPrinterMarkFormDictionary
+#endif  // SkPdfPrinterMarkFormDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.cpp
index 2c4dc71..1c74962 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfRadioButtonFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfRadioButtonFieldDictionary::Opt(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Opt", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.h
index 5b086d7..e45ffab 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRadioButtonFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfRadioButtonFieldDictionary
-#define __DEFINED__SkPdfRadioButtonFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfRadioButtonFieldDictionary_DEFINED
+#define SkPdfRadioButtonFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Opt() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfRadioButtonFieldDictionary
+#endif  // SkPdfRadioButtonFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.cpp
index c22e4a4..b242997 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfReferenceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfFileSpec SkPdfReferenceDictionary::F(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("F", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.h
index db70e0a..d2db65f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfReferenceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfReferenceDictionary
-#define __DEFINED__SkPdfReferenceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfReferenceDictionary_DEFINED
+#define SkPdfReferenceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,8 +520,10 @@
    bool valid() const {return true;}
   SkPdfFileSpec F(SkPdfNativeDoc* doc);
   bool has_F() const;
+
   bool isPageAInteger(SkPdfNativeDoc* doc);
   int64_t getPageAsInteger(SkPdfNativeDoc* doc);
+
   bool isPageAString(SkPdfNativeDoc* doc);
   SkString getPageAsString(SkPdfNativeDoc* doc);
   bool has_Page() const;
@@ -522,4 +531,4 @@
   bool has_ID() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfReferenceDictionary
+#endif  // SkPdfReferenceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.cpp
index b637029..e161bf6 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfRemoteGoToActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfRemoteGoToActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.h
index f6aa1d6..5a97f24 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRemoteGoToActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfRemoteGoToActionDictionary
-#define __DEFINED__SkPdfRemoteGoToActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfRemoteGoToActionDictionary_DEFINED
+#define SkPdfRemoteGoToActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,10 +522,13 @@
   bool has_S() const;
   SkPdfFileSpec F(SkPdfNativeDoc* doc);
   bool has_F() const;
+
   bool isDAName(SkPdfNativeDoc* doc);
   SkString getDAsName(SkPdfNativeDoc* doc);
+
   bool isDAString(SkPdfNativeDoc* doc);
   SkString getDAsString(SkPdfNativeDoc* doc);
+
   bool isDAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getDAsArray(SkPdfNativeDoc* doc);
   bool has_D() const;
@@ -526,4 +536,4 @@
   bool has_NewWindow() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfRemoteGoToActionDictionary
+#endif  // SkPdfRemoteGoToActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.cpp
index ff125a8..b61f88f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfResetFormActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfResetFormActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.h
index 1e613ae..7e6dd3a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResetFormActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfResetFormActionDictionary
-#define __DEFINED__SkPdfResetFormActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfResetFormActionDictionary_DEFINED
+#define SkPdfResetFormActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Flags() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfResetFormActionDictionary
+#endif  // SkPdfResetFormActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.cpp
index 313ea05..7a05430 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfResourceDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfResourceDictionary::ExtGState(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("ExtGState", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.h
index b098185..1616a8b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfResourceDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfResourceDictionary
-#define __DEFINED__SkPdfResourceDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfResourceDictionary_DEFINED
+#define SkPdfResourceDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -529,4 +536,4 @@
   bool has_Properties() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfResourceDictionary
+#endif  // SkPdfResourceDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.cpp
index 086d8d0..2317712 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfRubberStampAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfRubberStampAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.h
index 6edf613..021dbbf 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfRubberStampAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfRubberStampAnnotationDictionary
-#define __DEFINED__SkPdfRubberStampAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfRubberStampAnnotationDictionary_DEFINED
+#define SkPdfRubberStampAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Name() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfRubberStampAnnotationDictionary
+#endif  // SkPdfRubberStampAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.cpp
index 2344800..355f69e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSeparationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfSeparationDictionary::Pages(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Pages", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.h
index 81b434a..d1293b3 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSeparationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSeparationDictionary
-#define __DEFINED__SkPdfSeparationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSeparationDictionary_DEFINED
+#define SkPdfSeparationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,8 +520,10 @@
    bool valid() const {return true;}
   SkPdfArray* Pages(SkPdfNativeDoc* doc);
   bool has_Pages() const;
+
   bool isDeviceColorantAName(SkPdfNativeDoc* doc);
   SkString getDeviceColorantAsName(SkPdfNativeDoc* doc);
+
   bool isDeviceColorantAString(SkPdfNativeDoc* doc);
   SkString getDeviceColorantAsString(SkPdfNativeDoc* doc);
   bool has_DeviceColorant() const;
@@ -522,4 +531,4 @@
   bool has_ColorSpace() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSeparationDictionary
+#endif  // SkPdfSeparationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.cpp
index c7c591b..0cb4422 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfShadingDictionary::ShadingType(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("ShadingType", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.h
index 4cd439e..22c92df 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfShadingDictionary
-#define __DEFINED__SkPdfShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfShadingDictionary_DEFINED
+#define SkPdfShadingDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -495,8 +502,10 @@
    bool valid() const {return true;}
   int64_t ShadingType(SkPdfNativeDoc* doc);
   bool has_ShadingType() const;
+
   bool isColorSpaceAName(SkPdfNativeDoc* doc);
   SkString getColorSpaceAsName(SkPdfNativeDoc* doc);
+
   bool isColorSpaceAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getColorSpaceAsArray(SkPdfNativeDoc* doc);
   bool has_ColorSpace() const;
@@ -508,4 +517,4 @@
   bool has_AntiAlias() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfShadingDictionary
+#endif  // SkPdfShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.cpp
index 0013e9e..faf4886 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSignatureDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSignatureDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.h
index 65a366d..38634f9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSignatureDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSignatureDictionary
-#define __DEFINED__SkPdfSignatureDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSignatureDictionary_DEFINED
+#define SkPdfSignatureDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -531,4 +538,4 @@
   bool has_Reason() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSignatureDictionary
+#endif  // SkPdfSignatureDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.cpp
index e36de67..26ef583 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSoftMaskDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSoftMaskDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.h
index b2be94b..e7d6971 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSoftMaskDictionary
-#define __DEFINED__SkPdfSoftMaskDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSoftMaskDictionary_DEFINED
+#define SkPdfSoftMaskDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,11 +526,13 @@
   bool has_G() const;
   SkPdfArray* BC(SkPdfNativeDoc* doc);
   bool has_BC() const;
+
   bool isTRAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTRAsFunction(SkPdfNativeDoc* doc);
+
   bool isTRAName(SkPdfNativeDoc* doc);
   SkString getTRAsName(SkPdfNativeDoc* doc);
   bool has_TR() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSoftMaskDictionary
+#endif  // SkPdfSoftMaskDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.cpp
index 4f93f44..6d8601b7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSoftMaskImageDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfSoftMaskImageDictionary::Matte(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Matte", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.h
index 6427c40..61a69f9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoftMaskImageDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSoftMaskImageDictionary
-#define __DEFINED__SkPdfSoftMaskImageDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSoftMaskImageDictionary_DEFINED
+#define SkPdfSoftMaskImageDictionary_DEFINED
 
 #include "SkPdfImageDictionary_autogen.h"
 
@@ -21,4 +28,4 @@
   bool has_ColorSpace() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSoftMaskImageDictionary
+#endif  // SkPdfSoftMaskImageDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.cpp
index 2c3a60d..463e63b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSoundActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSoundActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.h
index fc179eb..f25385c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSoundActionDictionary
-#define __DEFINED__SkPdfSoundActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSoundActionDictionary_DEFINED
+#define SkPdfSoundActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_Mix() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSoundActionDictionary
+#endif  // SkPdfSoundActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.cpp
index dfc8213..319b698 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSoundAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSoundAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.h
index fda19a2..5df82f7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSoundAnnotationDictionary
-#define __DEFINED__SkPdfSoundAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSoundAnnotationDictionary_DEFINED
+#define SkPdfSoundAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Name() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSoundAnnotationDictionary
+#endif  // SkPdfSoundAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.cpp
index 661cae4..0bf17a7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSoundObjectDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSoundObjectDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.h
index d879c95..4cac479 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSoundObjectDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSoundObjectDictionary
-#define __DEFINED__SkPdfSoundObjectDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSoundObjectDictionary_DEFINED
+#define SkPdfSoundObjectDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -527,4 +534,4 @@
   bool has_CP() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSoundObjectDictionary
+#endif  // SkPdfSoundObjectDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.cpp
index e0aa003..e4e5787 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSourceInformationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfSourceInformationDictionary::isAUAString(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("AU", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.h
index 2dc80c6..d827dc1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSourceInformationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSourceInformationDictionary
-#define __DEFINED__SkPdfSourceInformationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSourceInformationDictionary_DEFINED
+#define SkPdfSourceInformationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -511,8 +518,10 @@
 
 public:
    bool valid() const {return true;}
+
   bool isAUAString(SkPdfNativeDoc* doc);
   SkString getAUAsString(SkPdfNativeDoc* doc);
+
   bool isAUADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getAUAsDictionary(SkPdfNativeDoc* doc);
   bool has_AU() const;
@@ -526,4 +535,4 @@
   bool has_C() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSourceInformationDictionary
+#endif  // SkPdfSourceInformationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.cpp
index 389a13b..7e0ed50 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSquareOrCircleAnnotation_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSquareOrCircleAnnotation::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.h
index f6128dc..1bb9ded 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSquareOrCircleAnnotation_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSquareOrCircleAnnotation
-#define __DEFINED__SkPdfSquareOrCircleAnnotation
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSquareOrCircleAnnotation_DEFINED
+#define SkPdfSquareOrCircleAnnotation_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_IC() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSquareOrCircleAnnotation
+#endif  // SkPdfSquareOrCircleAnnotation_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.cpp
index 2efe1c6..81d6e69 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfStandardSecurityHandlerDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 double SkPdfStandardSecurityHandlerDictionary::R(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("R", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.h
index 8584f5e..64705f9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardSecurityHandlerDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfStandardSecurityHandlerDictionary
-#define __DEFINED__SkPdfStandardSecurityHandlerDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfStandardSecurityHandlerDictionary_DEFINED
+#define SkPdfStandardSecurityHandlerDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_P() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfStandardSecurityHandlerDictionary
+#endif  // SkPdfStandardSecurityHandlerDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.cpp
index 44ae011..82f12a1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfStandardStructureDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfStandardStructureDictionary::Placement(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Placement", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.h
index 99ae79b..3cfc0fd 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStandardStructureDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfStandardStructureDictionary
-#define __DEFINED__SkPdfStandardStructureDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfStandardStructureDictionary_DEFINED
+#define SkPdfStandardStructureDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_WritingMode() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfStandardStructureDictionary
+#endif  // SkPdfStandardStructureDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.cpp
index 8f62907..26cd71b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfStreamCommonDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfStreamCommonDictionary::Length(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Length", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.h
index 4064060..fe445ed 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStreamCommonDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfStreamCommonDictionary
-#define __DEFINED__SkPdfStreamCommonDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfStreamCommonDictionary_DEFINED
+#define SkPdfStreamCommonDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,28 +520,36 @@
    bool valid() const {return true;}
   int64_t Length(SkPdfNativeDoc* doc);
   bool has_Length() const;
+
   bool isFilterAName(SkPdfNativeDoc* doc);
   SkString getFilterAsName(SkPdfNativeDoc* doc);
+
   bool isFilterAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getFilterAsArray(SkPdfNativeDoc* doc);
   bool has_Filter() const;
+
   bool isDecodeParmsADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getDecodeParmsAsDictionary(SkPdfNativeDoc* doc);
+
   bool isDecodeParmsAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getDecodeParmsAsArray(SkPdfNativeDoc* doc);
   bool has_DecodeParms() const;
   SkPdfFileSpec F(SkPdfNativeDoc* doc);
   bool has_F() const;
+
   bool isFFilterAName(SkPdfNativeDoc* doc);
   SkString getFFilterAsName(SkPdfNativeDoc* doc);
+
   bool isFFilterAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getFFilterAsArray(SkPdfNativeDoc* doc);
   bool has_FFilter() const;
+
   bool isFDecodeParmsADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getFDecodeParmsAsDictionary(SkPdfNativeDoc* doc);
+
   bool isFDecodeParmsAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getFDecodeParmsAsArray(SkPdfNativeDoc* doc);
   bool has_FDecodeParms() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfStreamCommonDictionary
+#endif  // SkPdfStreamCommonDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.cpp
index aac2e82..471dd63 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfStructureElementAccessDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfStructureElementAccessDictionary::StructParent(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("StructParent", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.h
index c30739e..acc17ae 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementAccessDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfStructureElementAccessDictionary
-#define __DEFINED__SkPdfStructureElementAccessDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfStructureElementAccessDictionary_DEFINED
+#define SkPdfStructureElementAccessDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_StructParents() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfStructureElementAccessDictionary
+#endif  // SkPdfStructureElementAccessDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.cpp
index 07acf77..eac2b37 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfStructureElementDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfStructureElementDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.h
index e4a350f..4e28286 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureElementDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfStructureElementDictionary
-#define __DEFINED__SkPdfStructureElementDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfStructureElementDictionary_DEFINED
+#define SkPdfStructureElementDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,8 +532,10 @@
   bool has_K() const;
   SkPdfNativeObject* A(SkPdfNativeDoc* doc);
   bool has_A() const;
+
   bool isCAName(SkPdfNativeDoc* doc);
   SkString getCAsName(SkPdfNativeDoc* doc);
+
   bool isCAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getCAsArray(SkPdfNativeDoc* doc);
   bool has_C() const;
@@ -542,4 +551,4 @@
   bool has_ActualText() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfStructureElementDictionary
+#endif  // SkPdfStructureElementDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.cpp
index 047c347..9614378 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfStructureTreeRootDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfStructureTreeRootDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.h
index 01dec19..167e6f1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfStructureTreeRootDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfStructureTreeRootDictionary
-#define __DEFINED__SkPdfStructureTreeRootDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfStructureTreeRootDictionary_DEFINED
+#define SkPdfStructureTreeRootDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,18 +520,24 @@
    bool valid() const {return true;}
   SkString Type(SkPdfNativeDoc* doc);
   bool has_Type() const;
+
   bool isKADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getKAsDictionary(SkPdfNativeDoc* doc);
+
   bool isKAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getKAsArray(SkPdfNativeDoc* doc);
   bool has_K() const;
+
   bool isIDTreeAName(SkPdfNativeDoc* doc);
   SkString getIDTreeAsName(SkPdfNativeDoc* doc);
+
   bool isIDTreeATree(SkPdfNativeDoc* doc);
   SkPdfTree getIDTreeAsTree(SkPdfNativeDoc* doc);
   bool has_IDTree() const;
+
   bool isParentTreeANumber(SkPdfNativeDoc* doc);
   double getParentTreeAsNumber(SkPdfNativeDoc* doc);
+
   bool isParentTreeATree(SkPdfNativeDoc* doc);
   SkPdfTree getParentTreeAsTree(SkPdfNativeDoc* doc);
   bool has_ParentTree() const;
@@ -536,4 +549,4 @@
   bool has_ClassMap() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfStructureTreeRootDictionary
+#endif  // SkPdfStructureTreeRootDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.cpp
index b0d94d4..e41e80d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfSubmitFormActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfSubmitFormActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.h
index bcf466a..0f4193a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfSubmitFormActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfSubmitFormActionDictionary
-#define __DEFINED__SkPdfSubmitFormActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfSubmitFormActionDictionary_DEFINED
+#define SkPdfSubmitFormActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Flags() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfSubmitFormActionDictionary
+#endif  // SkPdfSubmitFormActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.cpp
index 6e9b1f8..7b4e88c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTableAttributesDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfTableAttributesDictionary::RowSpan(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("RowSpan", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.h
index a49ee75..140ff50 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTableAttributesDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTableAttributesDictionary
-#define __DEFINED__SkPdfTableAttributesDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTableAttributesDictionary_DEFINED
+#define SkPdfTableAttributesDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_ColSpan() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTableAttributesDictionary
+#endif  // SkPdfTableAttributesDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.cpp
index c28453c..e2ced01 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTextAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfTextAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.h
index e30f19a..2a5cf72 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTextAnnotationDictionary
-#define __DEFINED__SkPdfTextAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTextAnnotationDictionary_DEFINED
+#define SkPdfTextAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_Name() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTextAnnotationDictionary
+#endif  // SkPdfTextAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.cpp
index 5eaf746..25d49e7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTextFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfTextFieldDictionary::MaxLen(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("MaxLen", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.h
index 0a98948..bd9e230 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTextFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTextFieldDictionary
-#define __DEFINED__SkPdfTextFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTextFieldDictionary_DEFINED
+#define SkPdfTextFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_MaxLen() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTextFieldDictionary
+#endif  // SkPdfTextFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.cpp
index 6c054bd..b02b199 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfThreadActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfThreadActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.h
index 7860b8e..e602b81 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfThreadActionDictionary
-#define __DEFINED__SkPdfThreadActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfThreadActionDictionary_DEFINED
+#define SkPdfThreadActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,18 +522,23 @@
   bool has_S() const;
   SkPdfFileSpec F(SkPdfNativeDoc* doc);
   bool has_F() const;
+
   bool isDADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getDAsDictionary(SkPdfNativeDoc* doc);
+
   bool isDAInteger(SkPdfNativeDoc* doc);
   int64_t getDAsInteger(SkPdfNativeDoc* doc);
+
   bool isDAString(SkPdfNativeDoc* doc);
   SkString getDAsString(SkPdfNativeDoc* doc);
   bool has_D() const;
+
   bool isBADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getBAsDictionary(SkPdfNativeDoc* doc);
+
   bool isBAInteger(SkPdfNativeDoc* doc);
   int64_t getBAsInteger(SkPdfNativeDoc* doc);
   bool has_B() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfThreadActionDictionary
+#endif  // SkPdfThreadActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.cpp
index d26f2e6..3ec2173 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfThreadDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfThreadDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.h
index 604adb5..564be48 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfThreadDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfThreadDictionary
-#define __DEFINED__SkPdfThreadDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfThreadDictionary_DEFINED
+#define SkPdfThreadDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_I() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfThreadDictionary
+#endif  // SkPdfThreadDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.cpp
index 0667cbe..38ee9f5 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTransitionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfTransitionDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.h
index d07ed74..19b1344 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransitionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTransitionDictionary
-#define __DEFINED__SkPdfTransitionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTransitionDictionary_DEFINED
+#define SkPdfTransitionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_Di() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTransitionDictionary
+#endif  // SkPdfTransitionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.cpp
index a1994c5..d91550d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTransparencyGroupDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfTransparencyGroupDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.h
index 325c60f..6872155 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTransparencyGroupDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTransparencyGroupDictionary
-#define __DEFINED__SkPdfTransparencyGroupDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTransparencyGroupDictionary_DEFINED
+#define SkPdfTransparencyGroupDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,8 +520,10 @@
    bool valid() const {return true;}
   SkString S(SkPdfNativeDoc* doc);
   bool has_S() const;
+
   bool isCSAName(SkPdfNativeDoc* doc);
   SkString getCSAsName(SkPdfNativeDoc* doc);
+
   bool isCSAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getCSAsArray(SkPdfNativeDoc* doc);
   bool has_CS() const;
@@ -524,4 +533,4 @@
   bool has_K() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTransparencyGroupDictionary
+#endif  // SkPdfTransparencyGroupDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp
index 6fa74ad..deeef45 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTrapNetworkAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfTrapNetworkAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.h
index a578abd..11bb90e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTrapNetworkAnnotationDictionary
-#define __DEFINED__SkPdfTrapNetworkAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTrapNetworkAnnotationDictionary_DEFINED
+#define SkPdfTrapNetworkAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,4 +532,4 @@
   bool has_FontFauxing() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTrapNetworkAnnotationDictionary
+#endif  // SkPdfTrapNetworkAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp
index 64ab1d5..0df1f6d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfTrapNetworkAppearanceStreamDictionary::PCM(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("PCM", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h
index eb52ec0..fd88fef 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrapNetworkAppearanceStreamDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTrapNetworkAppearanceStreamDictionary
-#define __DEFINED__SkPdfTrapNetworkAppearanceStreamDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTrapNetworkAppearanceStreamDictionary_DEFINED
+#define SkPdfTrapNetworkAppearanceStreamDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_TrapStyles() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTrapNetworkAppearanceStreamDictionary
+#endif  // SkPdfTrapNetworkAppearanceStreamDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.cpp
index bef7648..df3c92b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfTrueTypeFontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfTrueTypeFontDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.h
index 2e71b2f..5ec564f 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfTrueTypeFontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfTrueTypeFontDictionary
-#define __DEFINED__SkPdfTrueTypeFontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfTrueTypeFontDictionary_DEFINED
+#define SkPdfTrueTypeFontDictionary_DEFINED
 
 #include "SkPdfType1FontDictionary_autogen.h"
 
@@ -22,4 +29,4 @@
   bool has_Subtype() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfTrueTypeFontDictionary
+#endif  // SkPdfTrueTypeFontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.cpp
index 8a919fb..6c9e4a9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType0FontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType0FontDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.h
index 638e775..95ccd80 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType0FontDictionary
-#define __DEFINED__SkPdfType0FontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType0FontDictionary_DEFINED
+#define SkPdfType0FontDictionary_DEFINED
 
 #include "SkPdfFontDictionary_autogen.h"
 
@@ -31,8 +38,10 @@
   bool has_Subtype() const;
   SkString BaseFont(SkPdfNativeDoc* doc);
   bool has_BaseFont() const;
+
   bool isEncodingAName(SkPdfNativeDoc* doc);
   SkString getEncodingAsName(SkPdfNativeDoc* doc);
+
   bool isEncodingAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getEncodingAsStream(SkPdfNativeDoc* doc);
   bool has_Encoding() const;
@@ -42,4 +51,4 @@
   bool has_ToUnicode() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType0FontDictionary
+#endif  // SkPdfType0FontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.cpp
index 9dbe109..ea4888b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType0FunctionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfType0FunctionDictionary::Size(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Size", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.h
index ca26175..b16d6be 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType0FunctionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType0FunctionDictionary
-#define __DEFINED__SkPdfType0FunctionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType0FunctionDictionary_DEFINED
+#define SkPdfType0FunctionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -523,4 +530,4 @@
   bool has_Decode() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType0FunctionDictionary
+#endif  // SkPdfType0FunctionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.cpp
index 0e779e9..d62ef38 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType10HalftoneDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType10HalftoneDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.h
index 41960fb..c5e9892 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType10HalftoneDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType10HalftoneDictionary
-#define __DEFINED__SkPdfType10HalftoneDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType10HalftoneDictionary_DEFINED
+#define SkPdfType10HalftoneDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,11 +528,13 @@
   bool has_Xsquare() const;
   int64_t Ysquare(SkPdfNativeDoc* doc);
   bool has_Ysquare() const;
+
   bool isTransferFunctionAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTransferFunctionAsFunction(SkPdfNativeDoc* doc);
+
   bool isTransferFunctionAName(SkPdfNativeDoc* doc);
   SkString getTransferFunctionAsName(SkPdfNativeDoc* doc);
   bool has_TransferFunction() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType10HalftoneDictionary
+#endif  // SkPdfType10HalftoneDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.cpp
index 07cdef4..cf2f06a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType16HalftoneDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType16HalftoneDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.h
index de63781..a70b91e 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType16HalftoneDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType16HalftoneDictionary
-#define __DEFINED__SkPdfType16HalftoneDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType16HalftoneDictionary_DEFINED
+#define SkPdfType16HalftoneDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -525,11 +532,13 @@
   bool has_Width2() const;
   int64_t Height2(SkPdfNativeDoc* doc);
   bool has_Height2() const;
+
   bool isTransferFunctionAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTransferFunctionAsFunction(SkPdfNativeDoc* doc);
+
   bool isTransferFunctionAName(SkPdfNativeDoc* doc);
   SkString getTransferFunctionAsName(SkPdfNativeDoc* doc);
   bool has_TransferFunction() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType16HalftoneDictionary
+#endif  // SkPdfType16HalftoneDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.cpp
index c244716..7662182 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType1FontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType1FontDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.h
index 87f9af8..6a4cb20 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType1FontDictionary
-#define __DEFINED__SkPdfType1FontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType1FontDictionary_DEFINED
+#define SkPdfType1FontDictionary_DEFINED
 
 #include "SkPdfFontDictionary_autogen.h"
 
@@ -32,8 +39,10 @@
   bool has_Widths() const;
   SkPdfFontDescriptorDictionary* FontDescriptor(SkPdfNativeDoc* doc);
   bool has_FontDescriptor() const;
+
   bool isEncodingAName(SkPdfNativeDoc* doc);
   SkString getEncodingAsName(SkPdfNativeDoc* doc);
+
   bool isEncodingADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getEncodingAsDictionary(SkPdfNativeDoc* doc);
   bool has_Encoding() const;
@@ -41,4 +50,4 @@
   bool has_ToUnicode() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType1FontDictionary
+#endif  // SkPdfType1FontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.cpp
index 0672731..c581a3b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType1FormDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType1FormDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.h
index 3a7d293..968b1ef 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1FormDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType1FormDictionary
-#define __DEFINED__SkPdfType1FormDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType1FormDictionary_DEFINED
+#define SkPdfType1FormDictionary_DEFINED
 
 #include "SkPdfXObjectDictionary_autogen.h"
 
@@ -51,4 +58,4 @@
   bool has_OPI() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType1FormDictionary
+#endif  // SkPdfType1FormDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.cpp
index 865bf27..165362c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType1HalftoneDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType1HalftoneDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.h
index 4ebb298..5166c93 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1HalftoneDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType1HalftoneDictionary
-#define __DEFINED__SkPdfType1HalftoneDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType1HalftoneDictionary_DEFINED
+#define SkPdfType1HalftoneDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,18 +528,22 @@
   bool has_Frequency() const;
   double Angle(SkPdfNativeDoc* doc);
   bool has_Angle() const;
+
   bool isSpotFunctionAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getSpotFunctionAsFunction(SkPdfNativeDoc* doc);
+
   bool isSpotFunctionAName(SkPdfNativeDoc* doc);
   SkString getSpotFunctionAsName(SkPdfNativeDoc* doc);
   bool has_SpotFunction() const;
   bool AccurateScreens(SkPdfNativeDoc* doc);
   bool has_AccurateScreens() const;
+
   bool isTransferFunctionAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTransferFunctionAsFunction(SkPdfNativeDoc* doc);
+
   bool isTransferFunctionAName(SkPdfNativeDoc* doc);
   SkString getTransferFunctionAsName(SkPdfNativeDoc* doc);
   bool has_TransferFunction() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType1HalftoneDictionary
+#endif  // SkPdfType1HalftoneDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.cpp
index f35ffc5..969d3eb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType1PatternDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType1PatternDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.h
index 8a88b09..e58f29b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1PatternDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType1PatternDictionary
-#define __DEFINED__SkPdfType1PatternDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType1PatternDictionary_DEFINED
+#define SkPdfType1PatternDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -531,4 +538,4 @@
   bool has_Matrix() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType1PatternDictionary
+#endif  // SkPdfType1PatternDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.cpp
index eacb502..b86a60b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType1ShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfType1ShadingDictionary::Domain(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Domain", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.h
index ad58201..70039e6 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType1ShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType1ShadingDictionary
-#define __DEFINED__SkPdfType1ShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType1ShadingDictionary_DEFINED
+#define SkPdfType1ShadingDictionary_DEFINED
 
 #include "SkPdfShadingDictionary_autogen.h"
 
@@ -36,4 +43,4 @@
   bool has_Function() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType1ShadingDictionary
+#endif  // SkPdfType1ShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.cpp
index 8d6a3fa..92502ea 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType2FunctionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfType2FunctionDictionary::C0(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("C0", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.h
index 4024e55..e00494d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2FunctionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType2FunctionDictionary
-#define __DEFINED__SkPdfType2FunctionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType2FunctionDictionary_DEFINED
+#define SkPdfType2FunctionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_N() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType2FunctionDictionary
+#endif  // SkPdfType2FunctionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.cpp
index 77cbc54..666dc36 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType2PatternDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfType2PatternDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.h
index d0da28a..b5aaa42 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2PatternDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType2PatternDictionary
-#define __DEFINED__SkPdfType2PatternDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType2PatternDictionary_DEFINED
+#define SkPdfType2PatternDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,8 +522,10 @@
   bool has_Type() const;
   int64_t PatternType(SkPdfNativeDoc* doc);
   bool has_PatternType() const;
+
   bool isShadingADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getShadingAsDictionary(SkPdfNativeDoc* doc);
+
   bool isShadingAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getShadingAsStream(SkPdfNativeDoc* doc);
   bool has_Shading() const;
@@ -526,4 +535,4 @@
   bool has_ExtGState() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType2PatternDictionary
+#endif  // SkPdfType2PatternDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.cpp
index 05aca98..0a2da8c 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType2ShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfType2ShadingDictionary::Coords(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Coords", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.h
index 4607e5c..9feff35 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType2ShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType2ShadingDictionary
-#define __DEFINED__SkPdfType2ShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType2ShadingDictionary_DEFINED
+#define SkPdfType2ShadingDictionary_DEFINED
 
 #include "SkPdfShadingDictionary_autogen.h"
 
@@ -38,4 +45,4 @@
   bool has_Extend() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType2ShadingDictionary
+#endif  // SkPdfType2ShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.cpp
index eda0500..a16af18 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType3FontDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType3FontDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.h
index 1a0fa1b..797249a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FontDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType3FontDictionary
-#define __DEFINED__SkPdfType3FontDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType3FontDictionary_DEFINED
+#define SkPdfType3FontDictionary_DEFINED
 
 #include "SkPdfType1FontDictionary_autogen.h"
 
@@ -31,8 +38,10 @@
   bool has_FontMatrix() const;
   SkPdfDictionary* CharProcs(SkPdfNativeDoc* doc);
   bool has_CharProcs() const;
+
   bool isEncodingAName(SkPdfNativeDoc* doc);
   SkString getEncodingAsName(SkPdfNativeDoc* doc);
+
   bool isEncodingAEncodingdictionary(SkPdfNativeDoc* doc);
   SkPdfEncodingDictionary* getEncodingAsEncodingdictionary(SkPdfNativeDoc* doc);
   bool has_Encoding() const;
@@ -48,4 +57,4 @@
   bool has_ToUnicode() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType3FontDictionary
+#endif  // SkPdfType3FontDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.cpp
index 45ba9e3..5a0e664 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType3FunctionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfType3FunctionDictionary::Functions(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Functions", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.h
index f73d3d7..ed5da2b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3FunctionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType3FunctionDictionary
-#define __DEFINED__SkPdfType3FunctionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType3FunctionDictionary_DEFINED
+#define SkPdfType3FunctionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Encode() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType3FunctionDictionary
+#endif  // SkPdfType3FunctionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.cpp
index 7c859ae..129b9a9 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType3ShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfArray* SkPdfType3ShadingDictionary::Coords(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Coords", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.h
index af8b9dd..5ff6e45 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType3ShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType3ShadingDictionary
-#define __DEFINED__SkPdfType3ShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType3ShadingDictionary_DEFINED
+#define SkPdfType3ShadingDictionary_DEFINED
 
 #include "SkPdfShadingDictionary_autogen.h"
 
@@ -38,4 +45,4 @@
   bool has_Extend() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType3ShadingDictionary
+#endif  // SkPdfType3ShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.cpp
index 84d5111..3da811a 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType4ShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfType4ShadingDictionary::BitsPerCoordinate(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("BitsPerCoordinate", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.h
index 60c1d49..a105651 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType4ShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType4ShadingDictionary
-#define __DEFINED__SkPdfType4ShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType4ShadingDictionary_DEFINED
+#define SkPdfType4ShadingDictionary_DEFINED
 
 #include "SkPdfShadingDictionary_autogen.h"
 
@@ -40,4 +47,4 @@
   bool has_Function() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType4ShadingDictionary
+#endif  // SkPdfType4ShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.cpp
index ca39a16..9aff8a0 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType5HalftoneDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType5HalftoneDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
@@ -37,8 +43,8 @@
 bool SkPdfType5HalftoneDictionary::has_HalftoneName() const {
   return get("HalftoneName", "") != NULL;
 }
-
 /*
+
 bool SkPdfType5HalftoneDictionary::is[any_colorant_name]ADictionary(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("[any_colorant_name]", "");
   if (doc) {ret = doc->resolveReference(ret);}
@@ -70,8 +76,8 @@
 bool SkPdfType5HalftoneDictionary::has_[any_colorant_name]() const {
   return get("[any_colorant_name]", "") != NULL;
 }
-
 */
+
 bool SkPdfType5HalftoneDictionary::isDefaultADictionary(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Default", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.h
index 7bd5d3b..e19d5a1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5HalftoneDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType5HalftoneDictionary
-#define __DEFINED__SkPdfType5HalftoneDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType5HalftoneDictionary_DEFINED
+#define SkPdfType5HalftoneDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -518,17 +525,21 @@
   SkString HalftoneName(SkPdfNativeDoc* doc);
   bool has_HalftoneName() const;
 /*
+
   bool is[any_colorant_name]ADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* get[any_colorant_name]AsDictionary(SkPdfNativeDoc* doc);
+
   bool is[any_colorant_name]AStream(SkPdfNativeDoc* doc);
   SkPdfStream* get[any_colorant_name]AsStream(SkPdfNativeDoc* doc);
   bool has_[any_colorant_name]() const;
 */
+
   bool isDefaultADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getDefaultAsDictionary(SkPdfNativeDoc* doc);
+
   bool isDefaultAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getDefaultAsStream(SkPdfNativeDoc* doc);
   bool has_Default() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType5HalftoneDictionary
+#endif  // SkPdfType5HalftoneDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.cpp
index 4908bf9..b770857 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType5ShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfType5ShadingDictionary::BitsPerCoordinate(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("BitsPerCoordinate", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.h
index 2f5d806..07151d3 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType5ShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType5ShadingDictionary
-#define __DEFINED__SkPdfType5ShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType5ShadingDictionary_DEFINED
+#define SkPdfType5ShadingDictionary_DEFINED
 
 #include "SkPdfShadingDictionary_autogen.h"
 
@@ -40,4 +47,4 @@
   bool has_Function() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType5ShadingDictionary
+#endif  // SkPdfType5ShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.cpp
index cb77352..6a851a1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType6HalftoneDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfType6HalftoneDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.h
index f1c5fef..e7365a7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6HalftoneDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType6HalftoneDictionary
-#define __DEFINED__SkPdfType6HalftoneDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType6HalftoneDictionary_DEFINED
+#define SkPdfType6HalftoneDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,11 +528,13 @@
   bool has_Width() const;
   int64_t Height(SkPdfNativeDoc* doc);
   bool has_Height() const;
+
   bool isTransferFunctionAFunction(SkPdfNativeDoc* doc);
   SkPdfFunction getTransferFunctionAsFunction(SkPdfNativeDoc* doc);
+
   bool isTransferFunctionAName(SkPdfNativeDoc* doc);
   SkString getTransferFunctionAsName(SkPdfNativeDoc* doc);
   bool has_TransferFunction() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType6HalftoneDictionary
+#endif  // SkPdfType6HalftoneDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.cpp
index 5e9ece1..a3293de 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfType6ShadingDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 int64_t SkPdfType6ShadingDictionary::BitsPerCoordinate(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("BitsPerCoordinate", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.h
index d2751b9..d5a38b1 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfType6ShadingDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfType6ShadingDictionary
-#define __DEFINED__SkPdfType6ShadingDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfType6ShadingDictionary_DEFINED
+#define SkPdfType6ShadingDictionary_DEFINED
 
 #include "SkPdfShadingDictionary_autogen.h"
 
@@ -40,4 +47,4 @@
   bool has_Function() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfType6ShadingDictionary
+#endif  // SkPdfType6ShadingDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.cpp
index ae1c231..8fa4a37 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfURIActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfURIActionDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.h
index 71181de..a1c3087 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfURIActionDictionary
-#define __DEFINED__SkPdfURIActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfURIActionDictionary_DEFINED
+#define SkPdfURIActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_IsMap() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfURIActionDictionary
+#endif  // SkPdfURIActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.cpp
index 9bfaed3..14b3f46 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfURIDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfURIDictionary::Base(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Base", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.h
index 6e57f55..c3a87ac 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURIDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfURIDictionary
-#define __DEFINED__SkPdfURIDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfURIDictionary_DEFINED
+#define SkPdfURIDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -515,4 +522,4 @@
   bool has_Base() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfURIDictionary
+#endif  // SkPdfURIDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.cpp
index fb82a2f..b05b143 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfURLAliasDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfURLAliasDictionary::U(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("U", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.h
index db93802..97da9db 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfURLAliasDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfURLAliasDictionary
-#define __DEFINED__SkPdfURLAliasDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfURLAliasDictionary_DEFINED
+#define SkPdfURLAliasDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_C() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfURLAliasDictionary
+#endif  // SkPdfURLAliasDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.cpp
index 44f60b1..dcb8373 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfVariableTextFieldDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfVariableTextFieldDictionary::DR(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("DR", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.h
index 6350731..cf6414b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfVariableTextFieldDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfVariableTextFieldDictionary
-#define __DEFINED__SkPdfVariableTextFieldDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfVariableTextFieldDictionary_DEFINED
+#define SkPdfVariableTextFieldDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_Q() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfVariableTextFieldDictionary
+#endif  // SkPdfVariableTextFieldDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.cpp
index c1f1241..2537202 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfViewerPreferencesDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 bool SkPdfViewerPreferencesDictionary::HideToolbar(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("HideToolbar", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.h
index 63eaf4d..79cba59 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfViewerPreferencesDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfViewerPreferencesDictionary
-#define __DEFINED__SkPdfViewerPreferencesDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfViewerPreferencesDictionary_DEFINED
+#define SkPdfViewerPreferencesDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -537,4 +544,4 @@
   bool has_PrintClip() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfViewerPreferencesDictionary
+#endif  // SkPdfViewerPreferencesDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.cpp
index 0ae3a45..acc8ea8 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWebCaptureCommandDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfWebCaptureCommandDictionary::URL(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("URL", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.h
index 1f0e1bd..8b27409 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWebCaptureCommandDictionary
-#define __DEFINED__SkPdfWebCaptureCommandDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWebCaptureCommandDictionary_DEFINED
+#define SkPdfWebCaptureCommandDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,8 +524,10 @@
   bool has_L() const;
   int64_t F(SkPdfNativeDoc* doc);
   bool has_F() const;
+
   bool isPAString(SkPdfNativeDoc* doc);
   SkString getPAsString(SkPdfNativeDoc* doc);
+
   bool isPAStream(SkPdfNativeDoc* doc);
   SkPdfStream* getPAsStream(SkPdfNativeDoc* doc);
   bool has_P() const;
@@ -530,4 +539,4 @@
   bool has_S() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWebCaptureCommandDictionary
+#endif  // SkPdfWebCaptureCommandDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp
index 0268fe3..9076a97 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWebCaptureCommandSettingsDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkPdfDictionary* SkPdfWebCaptureCommandSettingsDictionary::G(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("G", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.h
index 54d15a9..1e65963 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureCommandSettingsDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWebCaptureCommandSettingsDictionary
-#define __DEFINED__SkPdfWebCaptureCommandSettingsDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWebCaptureCommandSettingsDictionary_DEFINED
+#define SkPdfWebCaptureCommandSettingsDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_C() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWebCaptureCommandSettingsDictionary
+#endif  // SkPdfWebCaptureCommandSettingsDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.cpp
index 1455dde..6ec8c05 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWebCaptureDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfWebCaptureDictionary::Type(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Type", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.h
index 9e65b76..a108153 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWebCaptureDictionary
-#define __DEFINED__SkPdfWebCaptureDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWebCaptureDictionary_DEFINED
+#define SkPdfWebCaptureDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,8 +526,10 @@
   bool has_ID() const;
   SkPdfArray* O(SkPdfNativeDoc* doc);
   bool has_O() const;
+
   bool isSIADictionary(SkPdfNativeDoc* doc);
   SkPdfDictionary* getSIAsDictionary(SkPdfNativeDoc* doc);
+
   bool isSIAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getSIAsArray(SkPdfNativeDoc* doc);
   bool has_SI() const;
@@ -530,4 +539,4 @@
   bool has_TS() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWebCaptureDictionary
+#endif  // SkPdfWebCaptureDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.cpp
index 7191003..3daadfb 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWebCaptureImageSetDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfWebCaptureImageSetDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.h
index 4dcd0f5..579fcb7 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureImageSetDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWebCaptureImageSetDictionary
-#define __DEFINED__SkPdfWebCaptureImageSetDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWebCaptureImageSetDictionary_DEFINED
+#define SkPdfWebCaptureImageSetDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -513,11 +520,13 @@
    bool valid() const {return true;}
   SkString S(SkPdfNativeDoc* doc);
   bool has_S() const;
+
   bool isRAInteger(SkPdfNativeDoc* doc);
   int64_t getRAsInteger(SkPdfNativeDoc* doc);
+
   bool isRAArray(SkPdfNativeDoc* doc);
   SkPdfArray* getRAsArray(SkPdfNativeDoc* doc);
   bool has_R() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWebCaptureImageSetDictionary
+#endif  // SkPdfWebCaptureImageSetDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.cpp
index efec4a4..cfcf355 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWebCaptureInformationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 double SkPdfWebCaptureInformationDictionary::V(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("V", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.h
index c25a6e3..0bb686b 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCaptureInformationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWebCaptureInformationDictionary
-#define __DEFINED__SkPdfWebCaptureInformationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWebCaptureInformationDictionary_DEFINED
+#define SkPdfWebCaptureInformationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -517,4 +524,4 @@
   bool has_C() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWebCaptureInformationDictionary
+#endif  // SkPdfWebCaptureInformationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.cpp
index 2a39d1e..01d9f2d 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWebCapturePageSetDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfWebCapturePageSetDictionary::S(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("S", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.h
index 9f4adfc..a5ee2a2 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWebCapturePageSetDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWebCapturePageSetDictionary
-#define __DEFINED__SkPdfWebCapturePageSetDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWebCapturePageSetDictionary_DEFINED
+#define SkPdfWebCapturePageSetDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -519,4 +526,4 @@
   bool has_TID() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWebCapturePageSetDictionary
+#endif  // SkPdfWebCapturePageSetDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.cpp
index cd34a89..ea26401 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWidgetAnnotationDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfWidgetAnnotationDictionary::Subtype(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("Subtype", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.h
index 77abd69..322ec99 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWidgetAnnotationDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWidgetAnnotationDictionary
-#define __DEFINED__SkPdfWidgetAnnotationDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWidgetAnnotationDictionary_DEFINED
+#define SkPdfWidgetAnnotationDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_MK() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWidgetAnnotationDictionary
+#endif  // SkPdfWidgetAnnotationDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.cpp
index 4d8190d..2351978 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.cpp
@@ -1,7 +1,13 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfWindowsLaunchActionDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
+
 SkString SkPdfWindowsLaunchActionDictionary::F(SkPdfNativeDoc* doc) {
   SkPdfNativeObject* ret = get("F", "");
   if (doc) {ret = doc->resolveReference(ret);}
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.h
index 6f885fa..917cb57 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfWindowsLaunchActionDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfWindowsLaunchActionDictionary
-#define __DEFINED__SkPdfWindowsLaunchActionDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfWindowsLaunchActionDictionary_DEFINED
+#define SkPdfWindowsLaunchActionDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -521,4 +528,4 @@
   bool has_P() const;
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfWindowsLaunchActionDictionary
+#endif  // SkPdfWindowsLaunchActionDictionary_DEFINED
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.cpp b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.cpp
index 5b6b637..0276fda 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.cpp
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.cpp
@@ -1,4 +1,9 @@
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
 #include "SkPdfXObjectDictionary_autogen.h"
-
-
 #include "SkPdfNativeDoc.h"
diff --git a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.h b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.h
index e26f07b..9028cf5 100644
--- a/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.h
+++ b/experimental/PdfViewer/pdfparser/native/pdfapi/SkPdfXObjectDictionary_autogen.h
@@ -1,5 +1,12 @@
-#ifndef __DEFINED__SkPdfXObjectDictionary
-#define __DEFINED__SkPdfXObjectDictionary
+/*
+ * Copyright 2013 Google Inc.
+
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+#ifndef SkPdfXObjectDictionary_DEFINED
+#define SkPdfXObjectDictionary_DEFINED
 
 #include "SkPdfDictionary_autogen.h"
 
@@ -503,4 +510,4 @@
    bool valid() const {return true;}
 };
 
-#endif  // __DEFINED__NATIVE_SkPdfXObjectDictionary
+#endif  // SkPdfXObjectDictionary_DEFINED