diff --git a/metaprogramming/BUILD b/metaprogramming/BUILD
index 866d690b..dd8009ad 100644
--- a/metaprogramming/BUILD
+++ b/metaprogramming/BUILD
@@ -12,7 +12,6 @@ exports_files(["LICENSE"])
 cc_library(
     name = "all",
     hdrs = ["all.h"],
-    deps = [":tuple_manipulation"],
 )
 
 cc_test(
@@ -71,10 +70,7 @@ cc_test(
 cc_library(
     name = "apply",
     hdrs = ["apply.h"],
-    deps = [
-        ":invoke",
-        ":tuple_manipulation",
-    ],
+    deps = [":tuple_manipulation"],
 )
 
 cc_test(
@@ -137,13 +133,7 @@ cc_test(
 cc_library(
     name = "cartesian_product",
     hdrs = ["cartesian_product.h"],
-    deps = [
-        ":concatenate",
-        ":n_bit",
-        ":n_bit_sequence",
-        ":type_index_mask",
-        ":type_of_nth_element",
-    ],
+    deps = [":n_bit_sequence"],
 )
 
 cc_test(
@@ -164,10 +154,7 @@ cc_test(
 cc_library(
     name = "chain",
     hdrs = ["chain.h"],
-    deps = [
-        ":invoke",
-        ":tuple_manipulation",
-    ],
+    deps = [":invoke"],
 )
 
 cc_test(
@@ -206,10 +193,8 @@ cc_library(
     name = "concatenate",
     hdrs = ["concatenate.h"],
     deps = [
-        ":invoke",
-        ":per_element",
+        ":combine",
         ":reduce",
-        ":tuple_manipulation",
     ],
 )
 
diff --git a/metaprogramming/all.h b/metaprogramming/all.h
index 333eea89..f850b74f 100644
--- a/metaprogramming/all.h
+++ b/metaprogramming/all.h
@@ -20,8 +20,6 @@
 #include <tuple>
 #include <type_traits>
 
-#include "tuple_manipulation.h"
-
 namespace jni::metaprogramming {
 
 template <typename Func>
diff --git a/metaprogramming/apply.h b/metaprogramming/apply.h
index a962af46..273dfa40 100644
--- a/metaprogramming/apply.h
+++ b/metaprogramming/apply.h
@@ -19,7 +19,6 @@
 
 #include <tuple>
 
-#include "invoke.h"
 #include "tuple_manipulation.h"
 
 namespace jni::metaprogramming {
diff --git a/metaprogramming/cartesian_product.h b/metaprogramming/cartesian_product.h
index ad74ae6d..574e2e69 100644
--- a/metaprogramming/cartesian_product.h
+++ b/metaprogramming/cartesian_product.h
@@ -21,11 +21,7 @@
 #include <type_traits>
 #include <utility>
 
-#include "concatenate.h"
-#include "n_bit.h"
 #include "n_bit_sequence.h"
-#include "type_index_mask.h"
-#include "type_of_nth_element.h"
 
 namespace jni::metaprogramming {
 
diff --git a/metaprogramming/chain.h b/metaprogramming/chain.h
index 32fa6532..1f699ee9 100644
--- a/metaprogramming/chain.h
+++ b/metaprogramming/chain.h
@@ -18,7 +18,6 @@
 #define JNI_BIND_METAPROGRAMMING_CHAIN_H_
 
 #include "invoke.h"
-#include "tuple_manipulation.h"
 
 namespace jni::metaprogramming {
 
diff --git a/metaprogramming/concatenate.h b/metaprogramming/concatenate.h
index b3c70251..97153c6e 100644
--- a/metaprogramming/concatenate.h
+++ b/metaprogramming/concatenate.h
@@ -19,10 +19,8 @@
 
 #include <tuple>
 
-#include "invoke.h"
-#include "per_element.h"
+#include "combine.h"
 #include "reduce.h"
-#include "tuple_manipulation.h"
 
 namespace jni::metaprogramming {