diff --git a/include/bits/include-all.hpp b/include/bits/include-all.hpp
new file mode 100644
index 0000000..639d3df
--- /dev/null
+++ b/include/bits/include-all.hpp
@@ -0,0 +1,39 @@
+#include <algorithm>
+#include <array>
+#include <bitset>
+#include <cmath>
+#include <complex>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <deque>
+#include <forward_list>
+#include <fstream>
+#include <functional>
+#include <initializer_list>
+#include <iomanip>
+#include <iostream>
+#include <iterator>
+#include <list>
+#include <memory>
+#include <ostream>
+#include <queue>
+#include <random>
+#include <set>
+#include <sstream>
+#include <stack>
+#include <stdexcept>
+#include <string>
+#include <tuple>
+#include <type_traits>
+#include <unordered_set>
+#include <utility>
+#include <valarray>
+#include <vector>
+
+#if __cplusplus >= 201703L
+#include <any>
+#include <optional>
+#include <string_view>
+#include <variant>
+#endif
diff --git a/include/bits/soi-dbg.hpp b/include/bits/soi-dbg.hpp
index bafd1a2..7bc3da9 100644
--- a/include/bits/soi-dbg.hpp
+++ b/include/bits/soi-dbg.hpp
@@ -14,6 +14,8 @@
 #include <stdexcept>
 #include <cstring>
 #include <ostream>
+#include <iostream>
+#include <sstream>
 
 #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 #include <unistd.h>
diff --git a/include/soi b/include/soi
index 2c6aa5a..5e4d9e6 100644
--- a/include/soi
+++ b/include/soi
@@ -5,33 +5,11 @@
    have to understand every concept all at once.
 */
 
-#include <algorithm>
-#include <array>
-#include <cmath>
-#include <cstddef>
-#include <cstdlib>
 #include <fstream>
-#include <iomanip>
-#include <iostream>
-#include <iterator>
-#include <list>
-#include <memory>
-#include <ostream>
-#include <set>
-#include <sstream>
-#include <stdexcept>
-#include <string>
-#include <tuple>
-#include <type_traits>
-#include <unordered_set>
-#include <utility>
-#include <valarray>
-#include <vector>
-
 #include "bits/soi-dbg.hpp"
 
 namespace soi_h {
-  
+
 void check_for_eof() {
     if (!(std::cin >> std::ws).eof())
         std::cerr << "WARNING: didn't read the whole input\n";
@@ -69,14 +47,14 @@ void initialize_debug() {
   std::cout << std::unitbuf; // enable automatic flushing
   std::cin.exceptions(std::ifstream::failbit | std::ifstream::badbit);
   std::ios::sync_with_stdio(false);
-  
+
   if (should_check_for_eof() &&
       std::atexit(noninteractive_check_eof) != 0) {
-    std::cerr << "WARNING: soi.h -- registration of sanity check at exit failed\n";    
+    std::cerr << "WARNING: soi.h -- registration of sanity check at exit failed\n";
   }
   soi_h::detail::dbg_init();
 }
- 
+
 struct soi_h_initializer {
   soi_h_initializer(bool release) {
     if (release) {
@@ -93,11 +71,12 @@ soi_h_initializer soi_h_initializer_{true};
 #else
 soi_h_initializer soi_h_initializer_{false};
 #endif
- 
+
 } // end namespace soi_h
 
 #include "bits/soi-deprecate.hpp"
 
+#include "bits/include-all.hpp"
+
 #define int int64_t
 using namespace std;
-