diff --git a/include/sdsl/bit_vectors.hpp b/include/sdsl/bit_vectors.hpp
index c1f0330c..c67431ad 100644
--- a/include/sdsl/bit_vectors.hpp
+++ b/include/sdsl/bit_vectors.hpp
@@ -8,4 +8,14 @@
 #ifndef INCLUDED_SDSL_BITVECTORS
 #define INCLUDED_SDSL_BITVECTORS
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/bit_vector_il.hpp>
+#include <sdsl/hyb_vector.hpp>
+#include <sdsl/int_vector.hpp>
+#include <sdsl/rrr_vector.hpp>
+#include <sdsl/sd_vector.hpp>
+// Cyclic includes end
+// clang-format on
+
 #endif
diff --git a/include/sdsl/bp_support.hpp b/include/sdsl/bp_support.hpp
index 75492db1..b7e19055 100644
--- a/include/sdsl/bp_support.hpp
+++ b/include/sdsl/bp_support.hpp
@@ -21,4 +21,12 @@
  *   - rr_enclose
  */
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/bp_support_g.hpp>
+#include <sdsl/bp_support_gg.hpp>
+#include <sdsl/bp_support_sada.hpp>
+// Cyclic includes end
+// clang-format on
+
 #endif
diff --git a/include/sdsl/coder.hpp b/include/sdsl/coder.hpp
index c8e38129..ea8ca070 100644
--- a/include/sdsl/coder.hpp
+++ b/include/sdsl/coder.hpp
@@ -11,6 +11,15 @@
 #include <assert.h>
 #include <stdint.h>
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/coder_comma.hpp>
+#include <sdsl/coder_elias_delta.hpp>
+#include <sdsl/coder_elias_gamma.hpp>
+#include <sdsl/coder_fibonacci.hpp>
+// Cyclic includes end
+// clang-format on
+
 namespace sdsl
 {
 
diff --git a/include/sdsl/int_vector.hpp b/include/sdsl/int_vector.hpp
index f62807df..2248e3e4 100644
--- a/include/sdsl/int_vector.hpp
+++ b/include/sdsl/int_vector.hpp
@@ -2169,4 +2169,11 @@ int_vector_trait<8>::end(const typename int_vector_trait<8>::int_vector_type * v
 
 } // end namespace sdsl
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/int_vector_buffer.hpp>
+#include <sdsl/int_vector_mapper.hpp>
+// Cyclic includes end
+// clang-format on
+
 #endif
diff --git a/include/sdsl/lcp.hpp b/include/sdsl/lcp.hpp
index ee768a94..7a6e4e0d 100644
--- a/include/sdsl/lcp.hpp
+++ b/include/sdsl/lcp.hpp
@@ -14,6 +14,23 @@
 
 #include <sdsl/sdsl_concepts.hpp>
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/construct_isa.hpp>
+#include <sdsl/csa_alphabet_strategy.hpp>
+#include <sdsl/int_vector.hpp>
+#include <sdsl/select_support_mcl.hpp>
+#include <sdsl/lcp_bitcompressed.hpp> // type (a)
+#include <sdsl/lcp_byte.hpp>          // type (a)
+#include <sdsl/lcp_dac.hpp>           // type (a)
+#include <sdsl/lcp_support_sada.hpp>  // type (b)
+#include <sdsl/lcp_support_tree.hpp>  // type (c)
+#include <sdsl/lcp_support_tree2.hpp> // type (c)
+#include <sdsl/lcp_vlc.hpp>           // type (a)
+#include <sdsl/lcp_wt.hpp>            // type (a)
+// Cyclic includes end
+// clang-format on
+
 //! Namespace for the succinct data structure library.
 namespace sdsl
 {
diff --git a/include/sdsl/rank_support.hpp b/include/sdsl/rank_support.hpp
index 4d9cb50e..4adee9cd 100644
--- a/include/sdsl/rank_support.hpp
+++ b/include/sdsl/rank_support.hpp
@@ -285,4 +285,12 @@ struct rank_support_trait<11, 2>
 
 } // namespace sdsl
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/rank_support_scan.hpp>
+#include <sdsl/rank_support_v.hpp>
+#include <sdsl/rank_support_v5.hpp>
+// Cyclic includes end
+// clang-format on
+
 #endif
diff --git a/include/sdsl/suffix_arrays.hpp b/include/sdsl/suffix_arrays.hpp
index acf1443d..caf22f1c 100644
--- a/include/sdsl/suffix_arrays.hpp
+++ b/include/sdsl/suffix_arrays.hpp
@@ -19,6 +19,16 @@
 #include <sdsl/enc_vector.hpp>
 #include <sdsl/wt_int.hpp>
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/sdsl_concepts.hpp>
+#include <sdsl/construct.hpp>
+#include <sdsl/csa_bitcompressed.hpp>
+#include <sdsl/suffix_array_algorithm.hpp>
+#include <sdsl/wavelet_trees.hpp>
+// Cyclic includes end
+// clang-format on
+
 namespace sdsl
 {
 
diff --git a/include/sdsl/suffix_tree_algorithm.hpp b/include/sdsl/suffix_tree_algorithm.hpp
index 3365a3af..43e89964 100644
--- a/include/sdsl/suffix_tree_algorithm.hpp
+++ b/include/sdsl/suffix_tree_algorithm.hpp
@@ -18,6 +18,12 @@
 #include <sdsl/int_vector.hpp>
 #include <sdsl/sdsl_concepts.hpp>
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/suffix_array_algorithm.hpp>
+// Cyclic includes end
+// clang-format on
+
 namespace sdsl
 {
 
diff --git a/include/sdsl/suffix_trees.hpp b/include/sdsl/suffix_trees.hpp
index 43f6080f..e096339e 100644
--- a/include/sdsl/suffix_trees.hpp
+++ b/include/sdsl/suffix_trees.hpp
@@ -20,4 +20,12 @@
  *    - ..
  */
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/cst_fully.hpp>
+#include <sdsl/cst_sada.hpp>
+#include <sdsl/cst_sct3.hpp>
+// Cyclic includes end
+// clang-format on
+
 #endif
diff --git a/include/sdsl/vectors.hpp b/include/sdsl/vectors.hpp
index 9cda1cec..118ac548 100644
--- a/include/sdsl/vectors.hpp
+++ b/include/sdsl/vectors.hpp
@@ -5,4 +5,13 @@
 #ifndef SDSL_INCLUDED_VECTORS
 #define SDSL_INCLUDED_VECTORS
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/dac_vector.hpp>
+#include <sdsl/enc_vector.hpp>
+#include <sdsl/int_vector.hpp>
+#include <sdsl/vlc_vector.hpp>
+// Cyclic includes end
+// clang-format on
+
 #endif
diff --git a/include/sdsl/wavelet_trees.hpp b/include/sdsl/wavelet_trees.hpp
index 6fb11cab..65700209 100644
--- a/include/sdsl/wavelet_trees.hpp
+++ b/include/sdsl/wavelet_trees.hpp
@@ -20,6 +20,22 @@
 #include <sdsl/wt_helper.hpp>
 #include <sdsl/wt_pc.hpp>
 
+// clang-format off
+// Cyclic includes start
+#include <sdsl/construct.hpp>
+#include <sdsl/wm_int.hpp>
+#include <sdsl/wt_algorithm.hpp>
+#include <sdsl/wt_ap.hpp>
+#include <sdsl/wt_blcd.hpp>
+#include <sdsl/wt_epr.hpp>
+#include <sdsl/wt_gmr.hpp>
+#include <sdsl/wt_huff.hpp>
+#include <sdsl/wt_hutu.hpp>
+#include <sdsl/wt_int.hpp>
+#include <sdsl/wt_rlmn.hpp>
+// Cyclic includes end
+// clang-format on
+
 namespace sdsl
 {
 struct balanced_shape;