Reduce header files including header files.
Main focus is getting heap.h out of runtime.h.
Change-Id: I8d13dce8512816db2820a27b24f5866cc871a04b
diff --git a/runtime/verifier/method_verifier.h b/runtime/verifier/method_verifier.h
index a23e80d..451c9e2 100644
--- a/runtime/verifier/method_verifier.h
+++ b/runtime/verifier/method_verifier.h
@@ -29,9 +29,8 @@
#include "dex_instruction.h"
#include "instruction_flags.h"
#include "method_reference.h"
-#include "mirror/object.h"
#include "reg_type.h"
-#include "reg_type_cache-inl.h"
+#include "reg_type_cache.h"
#include "register_line.h"
#include "safe_map.h"
@@ -170,10 +169,7 @@
std::ostream& Fail(VerifyError error);
// Log for verification information.
- std::ostream& LogVerifyInfo() {
- return info_messages_ << "VFY: " << PrettyMethod(dex_method_idx_, *dex_file_)
- << '[' << reinterpret_cast<void*>(work_insn_idx_) << "] : ";
- }
+ std::ostream& LogVerifyInfo();
// Dump the failures encountered by the verifier.
std::ostream& DumpFailures(std::ostream& os);