diff --git a/compiler/driver/dex_compilation_unit.h b/compiler/driver/dex_compilation_unit.h
index f68d93f..def90fa 100644
--- a/compiler/driver/dex_compilation_unit.h
+++ b/compiler/driver/dex_compilation_unit.h
@@ -23,7 +23,6 @@
 #include "dex/code_item_accessors.h"
 #include "dex/dex_file.h"
 #include "handle.h"
-#include "jni.h"
 
 namespace art {
 namespace mirror {
diff --git a/openjdkjvmti/deopt_manager.h b/openjdkjvmti/deopt_manager.h
index 065baa7..856f3f4 100644
--- a/openjdkjvmti/deopt_manager.h
+++ b/openjdkjvmti/deopt_manager.h
@@ -35,12 +35,8 @@
 #include <atomic>
 #include <unordered_map>
 
-#include "jni.h"
-#include "jvmti.h"
-
 #include "base/mutex.h"
 #include "runtime_callbacks.h"
-#include "ti_breakpoint.h"
 
 namespace art {
 class ArtMethod;
diff --git a/runtime/art_field.h b/runtime/art_field.h
index 99f2a1c..43adae5 100644
--- a/runtime/art_field.h
+++ b/runtime/art_field.h
@@ -17,8 +17,6 @@
 #ifndef ART_RUNTIME_ART_FIELD_H_
 #define ART_RUNTIME_ART_FIELD_H_
 
-#include <jni.h>
-
 #include "dex/dex_file_types.h"
 #include "dex/modifiers.h"
 #include "dex/primitive.h"
diff --git a/runtime/gc/collector/concurrent_copying.cc b/runtime/gc/collector/concurrent_copying.cc
index 3b57b07..8f7b76a 100644
--- a/runtime/gc/collector/concurrent_copying.cc
+++ b/runtime/gc/collector/concurrent_copying.cc
@@ -17,6 +17,7 @@
 #include "concurrent_copying.h"
 
 #include "art_field-inl.h"
+#include "barrier.h"
 #include "base/enums.h"
 #include "base/file_utils.h"
 #include "base/histogram-inl.h"
@@ -40,6 +41,7 @@
 #include "mirror/class-inl.h"
 #include "mirror/object-inl.h"
 #include "mirror/object-refvisitor-inl.h"
+#include "mirror/object_reference.h"
 #include "scoped_thread_state_change-inl.h"
 #include "thread-inl.h"
 #include "thread_list.h"
diff --git a/runtime/gc/collector/concurrent_copying.h b/runtime/gc/collector/concurrent_copying.h
index a2d4837..a41c17a 100644
--- a/runtime/gc/collector/concurrent_copying.h
+++ b/runtime/gc/collector/concurrent_copying.h
@@ -17,22 +17,22 @@
 #ifndef ART_RUNTIME_GC_COLLECTOR_CONCURRENT_COPYING_H_
 #define ART_RUNTIME_GC_COLLECTOR_CONCURRENT_COPYING_H_
 
-#include "barrier.h"
-#include "base/safe_map.h"
 #include "garbage_collector.h"
 #include "immune_spaces.h"
-#include "jni.h"
-#include "mirror/object_reference.h"
 #include "offsets.h"
 
+#include <map>
 #include <memory>
 #include <vector>
 
 namespace art {
+class Barrier;
 class Closure;
 class RootInfo;
 
 namespace mirror {
+template<class MirrorType> class CompressedReference;
+template<class MirrorType> class HeapReference;
 class Object;
 }  // namespace mirror
 
diff --git a/runtime/handle_scope.h b/runtime/handle_scope.h
index ec1d166..5a6f1ac 100644
--- a/runtime/handle_scope.h
+++ b/runtime/handle_scope.h
@@ -25,7 +25,6 @@
 #include "base/locks.h"
 #include "base/macros.h"
 #include "stack_reference.h"
-#include "verify_object.h"
 
 namespace art {
 
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index d35d526..981ecf1 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -19,7 +19,6 @@
 
 #include "base/bit_utils.h"
 #include "base/casts.h"
-#include "base/enums.h"
 #include "base/stride_iterator.h"
 #include "class_flags.h"
 #include "class_status.h"
@@ -38,6 +37,7 @@
 class TypeList;
 }  // namespace dex
 
+template<typename T> class ArraySlice;
 class ArtField;
 class ArtMethod;
 struct ClassOffsets;
@@ -47,7 +47,7 @@
 enum InvokeType : uint32_t;
 template <typename Iter> class IterationRange;
 template<typename T> class LengthPrefixedArray;
-template<typename T> class ArraySlice;
+enum class PointerSize : size_t;
 class Signature;
 class StringPiece;
 template<size_t kNumReferences> class PACKED(4) StackHandleScope;