diff --git a/include/rocksdb/filter_policy.h b/include/rocksdb/filter_policy.h
index d2da38b51..950fbe616 100644
--- a/include/rocksdb/filter_policy.h
+++ b/include/rocksdb/filter_policy.h
@@ -24,8 +24,6 @@
 #include <stdexcept>
 #include <string>
 #include <vector>
-#include "db/dbformat.h"
-#include "table/multiget_context.h"
 
 namespace rocksdb {
 
@@ -66,7 +64,6 @@ class FilterBitsBuilder {
 
 // A class that checks if a key can be in filter
 // It should be initialized by Slice generated by BitsBuilder
-using MultiGetRange = MultiGetContext::Range;
 class FilterBitsReader {
  public:
   virtual ~FilterBitsReader() {}
diff --git a/table/filter_block.h b/table/filter_block.h
index fe1678908..8abb88e5f 100644
--- a/table/filter_block.h
+++ b/table/filter_block.h
@@ -18,23 +18,27 @@
 
 #pragma once
 
-#include <memory>
 #include <stddef.h>
 #include <stdint.h>
+#include <memory>
 #include <string>
 #include <vector>
+#include "db/dbformat.h"
+#include "format.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/slice_transform.h"
 #include "rocksdb/table.h"
+#include "table/multiget_context.h"
 #include "util/hash.h"
-#include "format.h"
 
 namespace rocksdb {
 
 const uint64_t kNotValid = ULLONG_MAX;
 class FilterPolicy;
 
+using MultiGetRange = MultiGetContext::Range;
+
 // A FilterBlockBuilder is used to construct all of the filters for a
 // particular Table.  It generates a single string which is stored as
 // a special block in the Table.