diff --git a/include/rapidcheck/Check.hpp b/include/rapidcheck/Check.hpp
index 9d753476..63f718b9 100644
--- a/include/rapidcheck/Check.hpp
+++ b/include/rapidcheck/Check.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <iostream>
+#include <string>
 
 #include "rapidcheck/detail/Configuration.h"
 #include "rapidcheck/detail/Results.h"
diff --git a/include/rapidcheck/Classify.hpp b/include/rapidcheck/Classify.hpp
index 68944d97..2be2e679 100644
--- a/include/rapidcheck/Classify.hpp
+++ b/include/rapidcheck/Classify.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <initializer_list>
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/Gen.hpp b/include/rapidcheck/Gen.hpp
index 5adf0749..bf9a48e2 100644
--- a/include/rapidcheck/Gen.hpp
+++ b/include/rapidcheck/Gen.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cassert>
+#include <exception>
 
 #include "rapidcheck/detail/Any.h"
 #include "rapidcheck/detail/ImplicitParam.h"
diff --git a/include/rapidcheck/GenerationFailure.h b/include/rapidcheck/GenerationFailure.h
index 267bbf48..4852fcd5 100644
--- a/include/rapidcheck/GenerationFailure.h
+++ b/include/rapidcheck/GenerationFailure.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <stdexcept>
+#include <string>
 
 namespace rc {
 
diff --git a/include/rapidcheck/Log.hpp b/include/rapidcheck/Log.hpp
index c40d4ed9..bcc8c596 100644
--- a/include/rapidcheck/Log.hpp
+++ b/include/rapidcheck/Log.hpp
@@ -1,5 +1,9 @@
 #pragma once
 
+#include <cstdlib>
+#include <ostream>
+#include <string>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/Maybe.hpp b/include/rapidcheck/Maybe.hpp
index b7e4778c..093192bf 100644
--- a/include/rapidcheck/Maybe.hpp
+++ b/include/rapidcheck/Maybe.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 #include "rapidcheck/Show.h"
 
 namespace rc {
diff --git a/include/rapidcheck/Random.h b/include/rapidcheck/Random.h
index e510673b..6adb2e6b 100644
--- a/include/rapidcheck/Random.h
+++ b/include/rapidcheck/Random.h
@@ -1,7 +1,8 @@
 #pragma once
 
-#include <cstdint>
 #include <array>
+#include <cstdint>
+#include <cstdlib>
 #include <limits>
 
 namespace rc {
diff --git a/include/rapidcheck/Random.hpp b/include/rapidcheck/Random.hpp
index a2559b8d..f6c6c013 100644
--- a/include/rapidcheck/Random.hpp
+++ b/include/rapidcheck/Random.hpp
@@ -2,6 +2,8 @@
 
 #include "rapidcheck/detail/Serialization.h"
 
+#include <tuple>
+
 namespace rc {
 
 template <typename Iterator>
diff --git a/include/rapidcheck/Show.hpp b/include/rapidcheck/Show.hpp
index 98fa5721..ef7e1600 100644
--- a/include/rapidcheck/Show.hpp
+++ b/include/rapidcheck/Show.hpp
@@ -3,16 +3,19 @@
 #include <map>
 #include <vector>
 #include <deque>
-#include <forward_list>
 #include <list>
 #include <set>
 #include <unordered_set>
 #include <unordered_map>
 #include <memory>
+#include <cstdlib>
 #include <cstdint>
 #include <type_traits>
 #include <array>
 #include <sstream>
+#include <tuple>
+#include <ostream>
+#include <forward_list>
 
 #include "rapidcheck/detail/Traits.h"
 
diff --git a/include/rapidcheck/detail/AlignedUnion.h b/include/rapidcheck/detail/AlignedUnion.h
index 128cf27f..5b194fba 100644
--- a/include/rapidcheck/detail/AlignedUnion.h
+++ b/include/rapidcheck/detail/AlignedUnion.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdlib>
+#include <type_traits>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/detail/Any.h b/include/rapidcheck/detail/Any.h
index f49536a2..19de7949 100644
--- a/include/rapidcheck/detail/Any.h
+++ b/include/rapidcheck/detail/Any.h
@@ -1,6 +1,8 @@
 #pragma once
 
+
 #include <memory>
+#include <ostream>
 #include <string>
 
 namespace rc {
diff --git a/include/rapidcheck/detail/Any.hpp b/include/rapidcheck/detail/Any.hpp
index efb404fb..cc1c4562 100644
--- a/include/rapidcheck/detail/Any.hpp
+++ b/include/rapidcheck/detail/Any.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cassert>
+#include <typeinfo>
 
 #include "rapidcheck/Traits.h"
 #include "rapidcheck/Show.h"
diff --git a/include/rapidcheck/detail/ApplyTuple.h b/include/rapidcheck/detail/ApplyTuple.h
index a664c18f..2718eeab 100644
--- a/include/rapidcheck/detail/ApplyTuple.h
+++ b/include/rapidcheck/detail/ApplyTuple.h
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "rapidcheck/detail/IntSequence.h"
+#include <tuple>
+#include <utility>
+
+#include "rapidcheck/Traits.h"
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/BitStream.h b/include/rapidcheck/detail/BitStream.h
index 7fb80882..a44efbe1 100644
--- a/include/rapidcheck/detail/BitStream.h
+++ b/include/rapidcheck/detail/BitStream.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <cstdint>
+#include <type_traits>
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/BitStream.hpp b/include/rapidcheck/detail/BitStream.hpp
index 964a2fd5..1771bc4d 100644
--- a/include/rapidcheck/detail/BitStream.hpp
+++ b/include/rapidcheck/detail/BitStream.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
+#include <algorithm>
 #include <limits>
 
 #include "rapidcheck/detail/Utility.h"
+#include "rapidcheck/Gen.h"
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/ExecFixture.h b/include/rapidcheck/detail/ExecFixture.h
index d188d562..ca6bcdc1 100644
--- a/include/rapidcheck/detail/ExecFixture.h
+++ b/include/rapidcheck/detail/ExecFixture.h
@@ -1,5 +1,9 @@
 #pragma once
 
+
+#include <utility>
+#include <rapidcheck/detail/FunctionTraits.h>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/detail/FrequencyMap.h b/include/rapidcheck/detail/FrequencyMap.h
index 0f42ad19..55585a46 100644
--- a/include/rapidcheck/detail/FrequencyMap.h
+++ b/include/rapidcheck/detail/FrequencyMap.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <vector>
+#include <cstdlib>
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/FunctionTraits.h b/include/rapidcheck/detail/FunctionTraits.h
index 69c42606..260bce73 100644
--- a/include/rapidcheck/detail/FunctionTraits.h
+++ b/include/rapidcheck/detail/FunctionTraits.h
@@ -1,6 +1,10 @@
 #pragma once
 
+#include <type_traits>
+
 #include "TypeList.h"
+#include "rapidcheck/Traits.h"
+
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/IntSequence.h b/include/rapidcheck/detail/IntSequence.h
index 177f7f2e..241429d9 100644
--- a/include/rapidcheck/detail/IntSequence.h
+++ b/include/rapidcheck/detail/IntSequence.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <cstdlib>
+#include <type_traits>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/detail/Serialization.h b/include/rapidcheck/detail/Serialization.h
index cac64dfb..86643433 100644
--- a/include/rapidcheck/detail/Serialization.h
+++ b/include/rapidcheck/detail/Serialization.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+#include <cstdlib>
 #include <stdexcept>
 #include <string>
 #include <unordered_map>
diff --git a/include/rapidcheck/detail/Serialization.hpp b/include/rapidcheck/detail/Serialization.hpp
index 4755a3a2..12fa070a 100644
--- a/include/rapidcheck/detail/Serialization.hpp
+++ b/include/rapidcheck/detail/Serialization.hpp
@@ -1,6 +1,10 @@
 #include "Serialization.h"
 
+#include <algorithm>
 #include <limits>
+#include <type_traits>
+#include <utility>
+
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/ShowType.h b/include/rapidcheck/detail/ShowType.h
index 797c5f18..5851b5a5 100644
--- a/include/rapidcheck/detail/ShowType.h
+++ b/include/rapidcheck/detail/ShowType.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <iostream>
+#include <string>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/detail/TypeList.h b/include/rapidcheck/detail/TypeList.h
index 94e5ec97..c5f3a181 100644
--- a/include/rapidcheck/detail/TypeList.h
+++ b/include/rapidcheck/detail/TypeList.h
@@ -1,5 +1,8 @@
 #pragma once
 
+#include <tuple>
+#include <type_traits>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/detail/Utility.h b/include/rapidcheck/detail/Utility.h
index 7d21e2bd..596013df 100644
--- a/include/rapidcheck/detail/Utility.h
+++ b/include/rapidcheck/detail/Utility.h
@@ -1,8 +1,11 @@
 #pragma once
 
+#include <cstdlib>
+#include <limits>
 #include <string>
 #include <tuple>
-#include <limits>
+#include <type_traits>
+#include <utility>
 
 namespace rc {
 namespace detail {
diff --git a/include/rapidcheck/detail/Variant.hpp b/include/rapidcheck/detail/Variant.hpp
index e1b2da01..31b11ace 100644
--- a/include/rapidcheck/detail/Variant.hpp
+++ b/include/rapidcheck/detail/Variant.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <utility>
+
 namespace rc {
 namespace detail {
 
diff --git a/include/rapidcheck/fn/Common.h b/include/rapidcheck/fn/Common.h
index 7e5b3ba3..981e907c 100644
--- a/include/rapidcheck/fn/Common.h
+++ b/include/rapidcheck/fn/Common.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "rapidcheck/Traits.h"
+
 namespace rc {
 namespace fn {
 
diff --git a/include/rapidcheck/fn/Common.hpp b/include/rapidcheck/fn/Common.hpp
index 5ccf350f..6860ee3f 100644
--- a/include/rapidcheck/fn/Common.hpp
+++ b/include/rapidcheck/fn/Common.hpp
@@ -1,5 +1,10 @@
 #pragma once
 
+#include <type_traits>
+#include <utility>
+
+#include "rapidcheck/Traits.h"
+
 namespace rc {
 namespace fn {
 
diff --git a/include/rapidcheck/gen/Build.h b/include/rapidcheck/gen/Build.h
index 13125ec9..49176f6d 100644
--- a/include/rapidcheck/gen/Build.h
+++ b/include/rapidcheck/gen/Build.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "rapidcheck/Gen.h"
+
 namespace rc {
 namespace gen {
 namespace detail {
diff --git a/include/rapidcheck/gen/Chrono.hpp b/include/rapidcheck/gen/Chrono.hpp
index ff3e8218..3a1a4065 100644
--- a/include/rapidcheck/gen/Chrono.hpp
+++ b/include/rapidcheck/gen/Chrono.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "rapidcheck/gen/Arbitrary.h"
+
 namespace rc {
 namespace gen {
 namespace detail {
diff --git a/include/rapidcheck/gen/Exec.h b/include/rapidcheck/gen/Exec.h
index 68e2e397..8cc30338 100644
--- a/include/rapidcheck/gen/Exec.h
+++ b/include/rapidcheck/gen/Exec.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "rapidcheck/detail/FunctionTraits.h"
+#include "rapidcheck/Gen.h"
 
 namespace rc {
 namespace gen {
diff --git a/include/rapidcheck/gen/Select.h b/include/rapidcheck/gen/Select.h
index f8408626..0f4cb70b 100644
--- a/include/rapidcheck/gen/Select.h
+++ b/include/rapidcheck/gen/Select.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <initializer_list>
+
 namespace rc {
 namespace gen {
 
diff --git a/include/rapidcheck/gen/Select.hpp b/include/rapidcheck/gen/Select.hpp
index ff853268..a140ecbc 100644
--- a/include/rapidcheck/gen/Select.hpp
+++ b/include/rapidcheck/gen/Select.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <initializer_list>
+
 #include "rapidcheck/detail/FrequencyMap.h"
 #include "rapidcheck/gen/detail/ScaleInteger.h"
 
diff --git a/include/rapidcheck/gen/detail/ExecRaw.h b/include/rapidcheck/gen/detail/ExecRaw.h
index 0ddcb7dd..a5baab33 100644
--- a/include/rapidcheck/gen/detail/ExecRaw.h
+++ b/include/rapidcheck/gen/detail/ExecRaw.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "rapidcheck/Gen.h"
 #include "rapidcheck/detail/FunctionTraits.h"
 #include "rapidcheck/gen/detail/Recipe.h"
 
diff --git a/include/rapidcheck/gen/detail/ShrinkValueIterator.hpp b/include/rapidcheck/gen/detail/ShrinkValueIterator.hpp
index 1057d381..3ca4155d 100644
--- a/include/rapidcheck/gen/detail/ShrinkValueIterator.hpp
+++ b/include/rapidcheck/gen/detail/ShrinkValueIterator.hpp
@@ -1,4 +1,5 @@
 #pragma once
+#include <cstddef>
 
 namespace rc {
 namespace gen {
diff --git a/include/rapidcheck/seq/Create.hpp b/include/rapidcheck/seq/Create.hpp
index 8a6f52ae..dc20472a 100644
--- a/include/rapidcheck/seq/Create.hpp
+++ b/include/rapidcheck/seq/Create.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include "rapidcheck/seq/Transform.h"
+#include <cstdlib>
 
 namespace rc {
 namespace seq {
@@ -189,7 +190,7 @@ Seq<std::pair<std::size_t, std::size_t>> subranges(std::size_t start,
                        return seq::map(
                            seq::range<std::size_t>(start, end - rangeSize + 1),
                            [=](std::size_t rangeStart) {
-                             return std::make_pair(rangeStart,
+                             return std::pair<std::size_t, std::size_t>(rangeStart,
                                                    rangeStart + rangeSize);
                            });
                      });
diff --git a/src/GenerationFailure.cpp b/src/GenerationFailure.cpp
index a226141b..f2569c44 100644
--- a/src/GenerationFailure.cpp
+++ b/src/GenerationFailure.cpp
@@ -1,6 +1,8 @@
 #include "rapidcheck/GenerationFailure.h"
 
+
 #include <string>
+#include <utility>
 
 namespace rc {
 
diff --git a/src/detail/Base64.h b/src/detail/Base64.h
index 3cf8682e..6f37bc00 100644
--- a/src/detail/Base64.h
+++ b/src/detail/Base64.h
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cstdint>
+#include <cstdlib>
 #include <string>
 #include <vector>
 
diff --git a/src/detail/FrequencyMap.cpp b/src/detail/FrequencyMap.cpp
index eee43ab5..4b9674f9 100644
--- a/src/detail/FrequencyMap.cpp
+++ b/src/detail/FrequencyMap.cpp
@@ -1,6 +1,7 @@
 #include "rapidcheck/detail/FrequencyMap.h"
 
 #include <algorithm>
+#include <iterator>
 
 namespace rc {
 namespace detail {
@@ -15,7 +16,7 @@ FrequencyMap::FrequencyMap(const std::vector<std::size_t> &frequencies)
 }
 
 std::size_t FrequencyMap::lookup(std::size_t x) const {
-  return std::upper_bound(begin(m_table), end(m_table), x) - begin(m_table);
+  return std::upper_bound(std::begin(m_table), std::end(m_table), x) - std::begin(m_table);
 }
 
 std::size_t FrequencyMap::sum() const { return m_sum; }
diff --git a/src/seq/Create.cpp b/src/seq/Create.cpp
new file mode 100644
index 00000000..77cfc934
--- /dev/null
+++ b/src/seq/Create.cpp
@@ -0,0 +1 @@
+#include <rapidcheck/seq/Create.h>