diff --git a/runtime/gc/heap_verification_test.cc b/runtime/gc/heap_verification_test.cc
index 480ba2a..c8233e3 100644
--- a/runtime/gc/heap_verification_test.cc
+++ b/runtime/gc/heap_verification_test.cc
@@ -15,9 +15,15 @@
  */
 
 #include "common_runtime_test.h"
-#include "verification.h"
+
+#include "class_linker.h"
+#include "handle_scope-inl.h"
+#include "mirror/object-inl.h"
+#include "mirror/object_array-inl.h"
 #include "mirror/string.h"
+#include "runtime.h"
 #include "scoped_thread_state_change-inl.h"
+#include "verification.h"
 
 namespace art {
 namespace gc {
diff --git a/runtime/gc/verification.cc b/runtime/gc/verification.cc
index 9e79cb4..7b31c8a 100644
--- a/runtime/gc/verification.cc
+++ b/runtime/gc/verification.cc
@@ -19,6 +19,7 @@
 #include <iomanip>
 #include <sstream>
 
+#include "art_field-inl.h"
 #include "mirror/class-inl.h"
 
 namespace art {