diff --git a/experimental/PdfViewer/SkPdfRenderer.cpp b/experimental/PdfViewer/SkPdfRenderer.cpp
index f52d9a0..c5fc8f5 100644
--- a/experimental/PdfViewer/SkPdfRenderer.cpp
+++ b/experimental/PdfViewer/SkPdfRenderer.cpp
@@ -17,11 +17,18 @@
 #include "SkTypeface.h"
 #include "SkTArray.h"
 
+#include "SkPdfBasics.h"
+#include "SkPdfNativeTokenizer.h"
+
 #include <iostream>
 #include <cstdio>
 #include <stack>
 #include <set>
 
+extern "C" PdfContext* gPdfContext;
+extern "C" SkBitmap* gDumpBitmap;
+extern "C" SkCanvas* gDumpCanvas;
+
 __SK_FORCE_IMAGE_DECODER_LINKING;
 
 // TODO(edisonn): tool, show what objects were read at least, show the ones not even read
diff --git a/experimental/PdfViewer/SkPdfRenderer.h b/experimental/PdfViewer/SkPdfRenderer.h
index d6d2c92..d0e3384 100644
--- a/experimental/PdfViewer/SkPdfRenderer.h
+++ b/experimental/PdfViewer/SkPdfRenderer.h
@@ -6,15 +6,8 @@
  */
 
 
-#ifndef SkPdfParser_DEFINED
-#define SkPdfParser_DEFINED
-
-#include "SkPdfBasics.h"
-#include "SkPdfNativeTokenizer.h"
-
-extern "C" PdfContext* gPdfContext;
-extern "C" SkBitmap* gDumpBitmap;
-extern "C" SkCanvas* gDumpCanvas;
+#ifndef SkPdfRenderer_DEFINED
+#define SkPdfRenderer_DEFINED
 
 class SkCanvas;
 class SkNativeParsedPDF;
@@ -39,4 +32,4 @@
 
 void reportPdfRenderStats();
 
-#endif  // SkPdfParser_DEFINED
+#endif  // SkPdfRenderer_DEFINED
diff --git a/experimental/PdfViewer/pdf_viewer_main.cpp b/experimental/PdfViewer/pdf_viewer_main.cpp
index cc9c3ed..14c29ca 100644
--- a/experimental/PdfViewer/pdf_viewer_main.cpp
+++ b/experimental/PdfViewer/pdf_viewer_main.cpp
@@ -24,6 +24,9 @@
                                 "\tlast - last page\n"
                                 "\tnumber - a specific page number\n"
                );
+DEFINE_double(DPI, 72, "DPI to be used for rendering (scale).");
+// TODO(edisonn): add config for device target(gpu, raster, pdf), + ability not to render at all
+// TODO(edisonn): add ability to do the op N times, bench (either load N times, render n times or load + render n times)
 
 
 /**