cleanup in headers for faster compile

examples/int-vector-buffer-iterator.cpp

@@ -1,4 +1,5 @@
 #include <sdsl/vectors.hpp>
+#include <sdsl/int_vector_buffer.hpp>
 #include <iostream>
 #include <algorithm>
 

examples/uint64-array2int_vector.cpp

@@ -6,6 +6,7 @@
  */
 #include <sdsl/util.hpp>
 #include <sdsl/int_vector.hpp>
+#include <sdsl/int_vector_buffer.hpp>
 #include <iostream>
 #include <string>
 

include/sdsl/bits.hpp

@@ -21,9 +21,7 @@
 #ifndef INCLUDED_SDSL_BITS
 #define INCLUDED_SDSL_BITS
 
-#include <stdint.h> // for uint64_t uint32_t declaration
-#include <iostream>// for cerr
-#include <cassert>
+#include <cstdint> // for uint64_t uint32_t declaration
 #ifdef __BMI2__
 #include <immintrin.h>
 #endif

include/sdsl/construct.hpp

@@ -24,6 +24,7 @@
 
 #include "sdsl_concepts.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "construct_lcp.hpp"
 #include "construct_bwt.hpp"
 #include "construct_sa.hpp"

include/sdsl/construct_bwt.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_CONSTRUCT_BWT
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "sfstream.hpp"
 #include "util.hpp"
 #include "config.hpp" // for cache_config

include/sdsl/construct_lcp.hpp

@@ -24,6 +24,7 @@
 
 #include "config.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "sfstream.hpp"
 #include "rank_support.hpp"
 #include "select_support.hpp"

include/sdsl/construct_sa_se.hpp

@@ -3,6 +3,7 @@
 
 #include "io.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "rank_support.hpp"
 #include "select_support.hpp"
 #include <cmath>

include/sdsl/csa_alphabet_strategy.hpp

@@ -48,6 +48,7 @@
  */
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "sd_vector.hpp"
 #include "rank_support.hpp"
 #include "select_support.hpp"

include/sdsl/csa_bitcompressed.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_CSA_UNCOMPRESSED
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "sdsl_concepts.hpp"
 #include "suffix_array_helper.hpp"
 #include "iterators.hpp"

include/sdsl/csa_sada.hpp

@@ -23,6 +23,7 @@
 
 #include "enc_vector.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include "suffix_array_helper.hpp"
 #include "util.hpp"

include/sdsl/csa_sampling_strategy.hpp

@@ -52,9 +52,11 @@
  */
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "csa_alphabet_strategy.hpp" // for key_trait
 #include "inv_perm_support.hpp"
 #include "wavelet_trees.hpp"
+#include "construct.hpp"
 #include <set>
 #include <tuple>
 

include/sdsl/csa_wt.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_CSA_WT
 
 #include "wavelet_trees.hpp"
+#include "int_vector_buffer.hpp"
 #include "suffix_array_helper.hpp"
 #include "iterators.hpp"
 #include "util.hpp"

include/sdsl/cst_sada.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_CST_SADA
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include "lcp_support_sada.hpp"
 #include "select_support_mcl.hpp"

include/sdsl/cst_sct3.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_CST_SCT3
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include "lcp.hpp"
 #include "bp_support.hpp"

include/sdsl/dac_vector.hpp

@@ -23,6 +23,7 @@
 
 #include "bits.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include "rank_support_v5.hpp"
 #include "rrr_vector.hpp"

include/sdsl/enc_vector.hpp

@@ -22,6 +22,7 @@
 #define SDSL_ENC_VECTOR
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "coder.hpp"
 #include "iterators.hpp"
 

include/sdsl/int_vector.hpp

@@ -29,25 +29,17 @@
 #include "uintx_t.hpp"
 
 #include "memory_management.hpp"
-#include "ram_fs.hpp"
-#include "sfstream.hpp"
 
-#include <iosfwd>    // forward declaration of ostream
 #include <stdexcept> // for exceptions
 #include <iostream>  // for cerr
 #include <typeinfo>
 #include <cassert>
 #include <iterator>
-#include <cstdlib>
 #include <cstddef>
-#include <ctime>    // for rand initialization
 #include <cstring>  // for memcpy
-#include <ostream>
-#include <istream>
 #include <string>
 #include <initializer_list>
 #include <type_traits>
-#include <vector>
 #include <ios>
 
 //! Namespace for the succinct data structure library.
@@ -1602,6 +1594,4 @@ void int_vector<t_width>::load(std::istream& in)
 
 }// end namespace sdsl
 
-#include "int_vector_buffer.hpp"
-
 #endif

include/sdsl/k2_treap.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_K2_TREAP
 
 #include "sdsl/vectors.hpp"
+#include "sdsl/int_vector_buffer.hpp"
 #include "sdsl/bits.hpp"
 #include "sdsl/k2_treap_helper.hpp"
 #include "sdsl/k2_treap_algorithm.hpp"

include/sdsl/k2_treap_algorithm.hpp

@@ -22,6 +22,7 @@
 #define INCLUDED_SDSL_K2_TREAP_ALGORITHM
 
 #include "sdsl/vectors.hpp"
+#include "sdsl/int_vector_buffer.hpp"
 #include "sdsl/bits.hpp"
 #include "sdsl/k2_treap_helper.hpp"
 #include <tuple>

include/sdsl/lcp_bitcompressed.hpp

@@ -23,6 +23,7 @@
 
 #include "lcp.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 
 namespace sdsl

include/sdsl/lcp_byte.hpp

@@ -23,6 +23,7 @@
 
 #include "lcp.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include <iostream>
 #include <algorithm> // for lower_bound

include/sdsl/lcp_support_sada.hpp

@@ -23,6 +23,7 @@
 
 #include "lcp.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include "csa_sada.hpp"  // for default template initialization
 #include "select_support.hpp" // for default template initialization

include/sdsl/lcp_support_tree.hpp

@@ -4,6 +4,7 @@
 #include "lcp.hpp"
 #include "util.hpp"
 #include "lcp_wt.hpp"
+#include "int_vector_buffer.hpp"
 #include <iostream>
 #include <string>
 

include/sdsl/lcp_support_tree2.hpp

@@ -4,6 +4,7 @@
 #include "lcp.hpp"
 #include "util.hpp"
 #include "rank_support_v.hpp"
+#include "int_vector_buffer.hpp"
 #include "wt_huff.hpp"
 #include "sorted_multi_stack_support.hpp"
 #include <iostream>

include/sdsl/lcp_vlc.hpp

@@ -24,6 +24,7 @@
 #include "lcp.hpp"
 #include "vlc_vector.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include <iostream>
 #include <cassert>

include/sdsl/lcp_wt.hpp

@@ -24,6 +24,7 @@
 #include "lcp.hpp"
 #include "wt_huff.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 #include "util.hpp"
 #include <iostream>

include/sdsl/memory_management.hpp

@@ -11,10 +11,7 @@
 #include <map>
 #include <iostream>
 #include <cstdlib>
-#include <mutex>
 #include <chrono>
-#include <cstring>
-#include <set>
 #include <cstddef>
 #include <stack>
 #include <vector>

include/sdsl/rmq_succinct_sct.hpp

@@ -23,6 +23,7 @@
 
 #include "rmq_support.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "bp_support_sada.hpp"
 #include "suffix_tree_helper.hpp"
 #include "util.hpp"

include/sdsl/rrr_helper.hpp

@@ -28,8 +28,6 @@
 #endif
 #endif
 
-#include <algorithm> // for next permutation
-#include <iostream>
 #include "bits.hpp"
 #include "uint128_t.hpp"
 #include "uint256_t.hpp"

include/sdsl/rrr_vector.hpp

@@ -26,8 +26,6 @@
 #include "util.hpp"
 #include "rrr_helper.hpp" // for binomial helper class
 #include "iterators.hpp"
-#include <vector>
-#include <algorithm> // for next_permutation
 #include <iostream>
 
 //! Namespace for the succinct data structure library

include/sdsl/suffix_tree_helper.hpp

@@ -7,6 +7,7 @@
 #include <stack>
 #include "sorted_multi_stack_support.hpp"
 #include "sorted_stack_support.hpp"
+#include "int_vector_buffer.hpp"
 #include "iterators.hpp"
 
 namespace sdsl

include/sdsl/vlc_vector.hpp

@@ -22,6 +22,7 @@
 #define SDSL_VLC_VECTOR
 
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "coder_elias_delta.hpp"
 #include "iterators.hpp"
 

include/sdsl/wavelet_trees.hpp

@@ -38,7 +38,6 @@
 #include "wm_int.hpp"
 #include "wt_rlmn.hpp"
 #include "wt_ap.hpp"
-#include "construct.hpp"
 #include "wt_algorithm.hpp"
 
 namespace sdsl

include/sdsl/wm_int.hpp

@@ -24,6 +24,7 @@
 
 #include "sdsl_concepts.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "rank_support_v.hpp"
 #include "select_support_mcl.hpp"
 #include "wt_helper.hpp"

include/sdsl/wt_ap.hpp

@@ -24,6 +24,7 @@
 
 #include <sdsl/bit_vectors.hpp>
 #include <sdsl/int_vector.hpp>
+#include <sdsl/int_vector_buffer.hpp>
 #include <sdsl/vectors.hpp>
 
 //! Namespace for the succinct data structure library.

include/sdsl/wt_gmr.hpp

@@ -24,6 +24,7 @@
 
 #include <sdsl/bit_vectors.hpp>
 #include <sdsl/int_vector.hpp>
+#include <sdsl/int_vector_buffer.hpp>
 #include <sdsl/vectors.hpp>
 
 //! Namespace for the succinct data structure library.

include/sdsl/wt_int.hpp

@@ -25,6 +25,7 @@
 
 #include "sdsl_concepts.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "rank_support_v.hpp"
 #include "select_support_mcl.hpp"
 #include "wt_helper.hpp"

include/sdsl/wt_rlmn.hpp

@@ -24,6 +24,7 @@
 
 #include "sdsl_concepts.hpp"
 #include "int_vector.hpp"
+#include "int_vector_buffer.hpp"
 #include "sd_vector.hpp"// for standard initialisation of template parameters
 #include "util.hpp"
 #include "wt_huff.hpp"

lib/construct_isa.cpp

@@ -2,6 +2,7 @@
     Copyright (C) 2010 Simon Gog
 */
 #include "sdsl/construct_isa.hpp"
+#include "sdsl/int_vector_buffer.hpp"
 #include <string>
 
 namespace sdsl

lib/construct_lcp_helper.cpp

@@ -1,5 +1,6 @@
 #include "sdsl/construct_lcp_helper.hpp"
 #include "sdsl/int_vector.hpp"
+#include "sdsl/int_vector_buffer.hpp"
 #include <algorithm>
 
 namespace sdsl

test/csa_byte_test.cpp

@@ -1,5 +1,6 @@
 #include "sdsl/suffix_arrays.hpp"
 #include "sdsl/coder.hpp"
+#include "sdsl/construct.hpp"
 #include "gtest/gtest.h"
 #include <vector>
 #include <string>

test/csa_int_test.cpp

@@ -1,4 +1,5 @@
 #include "sdsl/suffix_arrays.hpp"
+#include "sdsl/construct.hpp"
 #include "gtest/gtest.h"
 #include <cstdlib>
 #include <vector>

test/cst_byte_test.cpp

@@ -1,5 +1,6 @@
 #include "cst_helper.hpp"
 #include "sdsl/suffix_trees.hpp"
+#include "sdsl/construct.hpp"
 #include "gtest/gtest.h"
 #include <vector>
 #include <string>

test/cst_int_test.cpp

@@ -1,5 +1,6 @@
 #include "sdsl/suffix_trees.hpp"
 #include "sdsl/lcp.hpp"
+#include "sdsl/construct.hpp"
 #include "cst_helper.hpp"
 #include "gtest/gtest.h"
 #include <vector>

test/int_vector_buffer_test.cpp

@@ -1,4 +1,5 @@
 #include "sdsl/int_vector.hpp"
+#include "sdsl/int_vector_buffer.hpp"
 #include "sdsl/util.hpp"
 #include "gtest/gtest.h"
 #include <vector>

test/replace_int_vector_value.cpp

@@ -1,4 +1,5 @@
 #include "sdsl/int_vector.hpp"
+#include "sdsl/int_vector_buffer.hpp"
 #include <string>
 #include <cstdlib>