diff --git a/folly/compression/BUCK b/folly/compression/BUCK
index 96c1582120d..d5b13766a64 100644
--- a/folly/compression/BUCK
+++ b/folly/compression/BUCK
@@ -96,11 +96,11 @@ cpp_library(
         "//folly:format",
         "//folly:portability",
         "//folly:range",
-        "//folly/experimental:bits",
         "//folly/experimental:instructions",
         "//folly/experimental:select64",
         "//folly/io:iobuf",
         "//folly/lang:bits",
+        "//folly/lang:bits_class",
         "//folly/lang:safe_assert",
     ],
     exported_external_deps = [
diff --git a/folly/compression/QuotientMultiSet-inl.h b/folly/compression/QuotientMultiSet-inl.h
index f2eeef4d14a..144d8fd6990 100644
--- a/folly/compression/QuotientMultiSet-inl.h
+++ b/folly/compression/QuotientMultiSet-inl.h
@@ -18,9 +18,9 @@
 
 #include <folly/Format.h>
 #include <folly/Portability.h>
-#include <folly/experimental/Bits.h>
 #include <folly/experimental/Select64.h>
 #include <folly/lang/Bits.h>
+#include <folly/lang/BitsClass.h>
 #include <folly/lang/SafeAssert.h>
 
 #include <glog/logging.h>
diff --git a/folly/compression/elias_fano/BUCK b/folly/compression/elias_fano/BUCK
index 3a332ca573a..d93d293ed67 100644
--- a/folly/compression/elias_fano/BUCK
+++ b/folly/compression/elias_fano/BUCK
@@ -15,10 +15,10 @@ cpp_library(
         "//folly:portability",
         "//folly:range",
         "//folly/compression/elias_fano:coding_detail",
-        "//folly/experimental:bits",
         "//folly/experimental:instructions",
         "//folly/experimental:select64",
         "//folly/lang:bits",
+        "//folly/lang:bits_class",
     ],
     exported_external_deps = [
         "glog",
diff --git a/folly/compression/elias_fano/BitVectorCoding.h b/folly/compression/elias_fano/BitVectorCoding.h
index ead7adc4fe0..0c72db3b47c 100644
--- a/folly/compression/elias_fano/BitVectorCoding.h
+++ b/folly/compression/elias_fano/BitVectorCoding.h
@@ -26,10 +26,10 @@
 #include <folly/Portability.h>
 #include <folly/Range.h>
 #include <folly/compression/elias_fano/CodingDetail.h>
-#include <folly/experimental/Bits.h>
 #include <folly/experimental/Instructions.h>
 #include <folly/experimental/Select64.h>
 #include <folly/lang/Bits.h>
+#include <folly/lang/BitsClass.h>
 
 namespace folly {
 namespace compression {