diff --git a/libdexfile/dex/dex_file-inl.h b/libdexfile/dex/dex_file-inl.h
index 9a720c2..2af1e04 100644
--- a/libdexfile/dex/dex_file-inl.h
+++ b/libdexfile/dex/dex_file-inl.h
@@ -20,6 +20,7 @@
 #include "dex_file.h"
 
 #include "base/casts.h"
+#include "base/iteration_range.h"
 #include "base/leb128.h"
 #include "base/stringpiece.h"
 #include "base/utils.h"
diff --git a/libdexfile/dex/dex_file.h b/libdexfile/dex/dex_file.h
index cf32780..a940a66 100644
--- a/libdexfile/dex/dex_file.h
+++ b/libdexfile/dex/dex_file.h
@@ -24,7 +24,6 @@
 #include <android-base/logging.h>
 
 #include "base/globals.h"
-#include "base/iteration_range.h"
 #include "base/macros.h"
 #include "base/value_object.h"
 #include "class_iterator.h"
@@ -40,6 +39,7 @@
 class CompactDexFile;
 class DexInstructionIterator;
 enum InvokeType : uint32_t;
+template <typename Iter> class IterationRange;
 class MemMap;
 class OatDexFile;
 class StandardDexFile;
diff --git a/runtime/art_method.h b/runtime/art_method.h
index 70bcbc9..aed9f62 100644
--- a/runtime/art_method.h
+++ b/runtime/art_method.h
@@ -26,7 +26,6 @@
 #include "base/bit_utils.h"
 #include "base/casts.h"
 #include "base/enums.h"
-#include "base/iteration_range.h"
 #include "base/macros.h"
 #include "base/runtime_debug.h"
 #include "dex/code_item_accessors.h"
diff --git a/runtime/mirror/class-inl.h b/runtime/mirror/class-inl.h
index bdad412..0f19bac 100644
--- a/runtime/mirror/class-inl.h
+++ b/runtime/mirror/class-inl.h
@@ -22,6 +22,7 @@
 #include "art_field.h"
 #include "art_method.h"
 #include "base/array_slice.h"
+#include "base/iteration_range.h"
 #include "base/length_prefixed_array.h"
 #include "base/utils.h"
 #include "class_linker.h"
diff --git a/runtime/mirror/class.h b/runtime/mirror/class.h
index 8e392bc..5682def 100644
--- a/runtime/mirror/class.h
+++ b/runtime/mirror/class.h
@@ -20,7 +20,6 @@
 #include "base/bit_utils.h"
 #include "base/casts.h"
 #include "base/enums.h"
-#include "base/iteration_range.h"
 #include "base/stride_iterator.h"
 #include "class_flags.h"
 #include "class_status.h"
@@ -43,6 +42,7 @@
 class DexFile;
 template<class T> class Handle;
 enum InvokeType : uint32_t;
+template <typename Iter> class IterationRange;
 template<typename T> class LengthPrefixedArray;
 template<typename T> class ArraySlice;
 class Signature;