diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index 14aa6c1..a53edb7 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <iterator>
 #include <map>
 #include <sstream>
 #include <string>
diff --git a/testing/test_support.cpp b/testing/test_support.cpp
index 608e4ae..681a7ba 100644
--- a/testing/test_support.cpp
+++ b/testing/test_support.cpp
@@ -7,13 +7,13 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <string>
-
+#include "core/fdrm/crypto/fx_crypt.h"
 #include "core/fxcrt/fx_memory.h"
 #include "testing/utils/path_service.h"
 
 #ifdef PDF_ENABLE_V8
 #include "v8/include/libplatform/libplatform.h"
+#include "v8/include/v8.h"
 #endif
 
 namespace {
diff --git a/testing/test_support.h b/testing/test_support.h
index 7795be4..1465822 100644
--- a/testing/test_support.h
+++ b/testing/test_support.h
@@ -6,18 +6,13 @@
 #define TESTING_TEST_SUPPORT_H_
 
 #include <stdlib.h>
+
 #include <memory>
 #include <string>
 #include <vector>
 
-#include "core/fdrm/crypto/fx_crypt.h"
 #include "public/fpdf_save.h"
 #include "public/fpdfview.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-#ifdef PDF_ENABLE_V8
-#include "v8/include/v8.h"
-#endif  // PDF_ENABLE_V8
 
 namespace pdfium {
 
@@ -81,7 +76,13 @@
 std::string GenerateMD5Base16(const uint8_t* data, uint32_t size);
 
 #ifdef PDF_ENABLE_V8
+namespace v8 {
+class Platform;
+}
 #ifdef V8_USE_EXTERNAL_STARTUP_DATA
+namespace v8 {
+class StartupData;
+}
 bool InitializeV8ForPDFium(const std::string& exe_path,
                            const std::string& bin_dir,
                            v8::StartupData* natives_blob,