diff --git a/patchoat/patchoat.cc b/patchoat/patchoat.cc
index 1ee2fbd..ed7623a 100644
--- a/patchoat/patchoat.cc
+++ b/patchoat/patchoat.cc
@@ -35,17 +35,17 @@
 #include "base/stringpiece.h"
 #include "base/unix_file/fd_file.h"
 #include "base/unix_file/random_access_file_utils.h"
-#include "elf_utils.h"
 #include "elf_file.h"
 #include "elf_file_impl.h"
+#include "elf_utils.h"
 #include "gc/space/image_space.h"
 #include "image-inl.h"
 #include "intern_table.h"
 #include "mirror/dex_cache.h"
 #include "mirror/executable.h"
+#include "mirror/method.h"
 #include "mirror/object-inl.h"
 #include "mirror/object-refvisitor-inl.h"
-#include "mirror/method.h"
 #include "mirror/reference.h"
 #include "noop_compiler_callbacks.h"
 #include "offsets.h"
diff --git a/patchoat/patchoat.h b/patchoat/patchoat.h
index 182ce94..d4c5a10 100644
--- a/patchoat/patchoat.h
+++ b/patchoat/patchoat.h
@@ -24,8 +24,8 @@
 #include "elf_file.h"
 #include "elf_utils.h"
 #include "gc/accounting/space_bitmap.h"
-#include "gc/space/image_space.h"
 #include "gc/heap.h"
+#include "gc/space/image_space.h"
 #include "os.h"
 #include "runtime.h"