diff --git a/include/msgpack/adaptor/tr1/unordered_map.hpp b/include/msgpack/adaptor/tr1/unordered_map.hpp
index 9c8190e85..b24ac2319 100644
--- a/include/msgpack/adaptor/tr1/unordered_map.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_map.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
diff --git a/include/msgpack/adaptor/tr1/unordered_set.hpp b/include/msgpack/adaptor/tr1/unordered_set.hpp
index dd6c0448f..9c92c2108 100644
--- a/include/msgpack/adaptor/tr1/unordered_set.hpp
+++ b/include/msgpack/adaptor/tr1/unordered_set.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
diff --git a/include/msgpack/v1/adaptor/array_ref_decl.hpp b/include/msgpack/v1/adaptor/array_ref_decl.hpp
index 433e24f66..26a0405da 100644
--- a/include/msgpack/v1/adaptor/array_ref_decl.hpp
+++ b/include/msgpack/v1/adaptor/array_ref_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 
diff --git a/include/msgpack/v1/adaptor/bool.hpp b/include/msgpack/v1/adaptor/bool.hpp
index 95cd704f3..420d53988 100644
--- a/include/msgpack/v1/adaptor/bool.hpp
+++ b/include/msgpack/v1/adaptor/bool.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 
diff --git a/include/msgpack/v1/adaptor/boost/fusion.hpp b/include/msgpack/v1/adaptor/boost/fusion.hpp
index d47a7f24c..9d12a368d 100644
--- a/include/msgpack/v1/adaptor/boost/fusion.hpp
+++ b/include/msgpack/v1/adaptor/boost/fusion.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 #include "msgpack/meta.hpp"
 
diff --git a/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp b/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
index 46609a115..15ad18d47 100644
--- a/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
+++ b/include/msgpack/v1/adaptor/boost/msgpack_variant_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 #include "msgpack/adaptor/boost/string_ref.hpp"
 #include "msgpack/adaptor/ext.hpp"
diff --git a/include/msgpack/v1/adaptor/boost/optional.hpp b/include/msgpack/v1/adaptor/boost/optional.hpp
index bd51cdf29..ec8f60b6b 100644
--- a/include/msgpack/v1/adaptor/boost/optional.hpp
+++ b/include/msgpack/v1/adaptor/boost/optional.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #if defined(__GNUC__)
diff --git a/include/msgpack/v1/adaptor/boost/string_ref.hpp b/include/msgpack/v1/adaptor/boost/string_ref.hpp
index 9af03898b..79b60898b 100644
--- a/include/msgpack/v1/adaptor/boost/string_ref.hpp
+++ b/include/msgpack/v1/adaptor/boost/string_ref.hpp
@@ -15,6 +15,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <boost/utility/string_ref.hpp>
diff --git a/include/msgpack/v1/adaptor/boost/string_view.hpp b/include/msgpack/v1/adaptor/boost/string_view.hpp
index e3023ca32..e1743900c 100644
--- a/include/msgpack/v1/adaptor/boost/string_view.hpp
+++ b/include/msgpack/v1/adaptor/boost/string_view.hpp
@@ -15,6 +15,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <boost/utility/string_view.hpp>
diff --git a/include/msgpack/v1/adaptor/cpp11/array.hpp b/include/msgpack/v1/adaptor/cpp11/array.hpp
index 1a5ba36bb..e816d64a4 100644
--- a/include/msgpack/v1/adaptor/cpp11/array.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/array.hpp
@@ -13,6 +13,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 #include "msgpack/meta.hpp"
 
diff --git a/include/msgpack/v1/adaptor/cpp11/array_char.hpp b/include/msgpack/v1/adaptor/cpp11/array_char.hpp
index 865e77eb5..01888f5a4 100644
--- a/include/msgpack/v1/adaptor/cpp11/array_char.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/array_char.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <array>
diff --git a/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp b/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
index 5b35d15f7..0c698f0c2 100644
--- a/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/array_unsigned_char.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <array>
diff --git a/include/msgpack/v1/adaptor/cpp11/chrono.hpp b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
index 333194ed5..0fa77ebdb 100644
--- a/include/msgpack/v1/adaptor/cpp11/chrono.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/chrono.hpp
@@ -13,6 +13,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <chrono>
diff --git a/include/msgpack/v1/adaptor/cpp11/forward_list.hpp b/include/msgpack/v1/adaptor/cpp11/forward_list.hpp
index c207c0472..c615411df 100644
--- a/include/msgpack/v1/adaptor/cpp11/forward_list.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/forward_list.hpp
@@ -13,6 +13,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <forward_list>
diff --git a/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp b/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
index 02abe8376..4e2d387f8 100644
--- a/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/reference_wrapper.hpp
@@ -13,6 +13,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <memory>
diff --git a/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp b/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
index f11d63d98..0244074ce 100644
--- a/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/shared_ptr.hpp
@@ -13,6 +13,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <memory>
diff --git a/include/msgpack/v1/adaptor/cpp11/timespec.hpp b/include/msgpack/v1/adaptor/cpp11/timespec.hpp
index dc047ee00..c68294dec 100644
--- a/include/msgpack/v1/adaptor/cpp11/timespec.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/timespec.hpp
@@ -13,6 +13,7 @@
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
 #include "msgpack/object.hpp"
+#include "msgpack/object.hpp"
 
 #include <ctime>
 
diff --git a/include/msgpack/v1/adaptor/cpp11/tuple.hpp b/include/msgpack/v1/adaptor/cpp11/tuple.hpp
index 08b14f5c4..fd1fc8e91 100644
--- a/include/msgpack/v1/adaptor/cpp11/tuple.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/tuple.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 #include "msgpack/meta.hpp"
 
diff --git a/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp b/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
index a175a84e5..559756870 100644
--- a/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/unique_ptr.hpp
@@ -13,6 +13,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <memory>
diff --git a/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp b/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
index bcd8fddc9..551838342 100644
--- a/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/unordered_map.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <unordered_map>
diff --git a/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp b/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
index 44a3cc3b6..a8e9515a8 100644
--- a/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
+++ b/include/msgpack/v1/adaptor/cpp11/unordered_set.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <unordered_set>
diff --git a/include/msgpack/v1/adaptor/cpp17/array_byte.hpp b/include/msgpack/v1/adaptor/cpp17/array_byte.hpp
index ffaf427a0..783d37a9d 100644
--- a/include/msgpack/v1/adaptor/cpp17/array_byte.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/array_byte.hpp
@@ -16,6 +16,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <array>
diff --git a/include/msgpack/v1/adaptor/cpp17/byte.hpp b/include/msgpack/v1/adaptor/cpp17/byte.hpp
index 4401567ea..7bf7015b2 100644
--- a/include/msgpack/v1/adaptor/cpp17/byte.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/byte.hpp
@@ -16,6 +16,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
 #include "msgpack/adaptor/int_decl.hpp"
 #include "msgpack/object.hpp"
diff --git a/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp b/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
index 85e43c738..df4bbdc87 100644
--- a/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/carray_byte.hpp
@@ -16,6 +16,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <cstring>
diff --git a/include/msgpack/v1/adaptor/cpp17/optional.hpp b/include/msgpack/v1/adaptor/cpp17/optional.hpp
index 5f38fe2e7..44407a76a 100644
--- a/include/msgpack/v1/adaptor/cpp17/optional.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/optional.hpp
@@ -16,6 +16,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <optional>
diff --git a/include/msgpack/v1/adaptor/cpp17/string_view.hpp b/include/msgpack/v1/adaptor/cpp17/string_view.hpp
index 9341cb732..060c259e3 100644
--- a/include/msgpack/v1/adaptor/cpp17/string_view.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/string_view.hpp
@@ -16,6 +16,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <string_view>
diff --git a/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp b/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
index 0f2dba175..c486f7dac 100644
--- a/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
+++ b/include/msgpack/v1/adaptor/cpp17/vector_byte.hpp
@@ -16,6 +16,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <vector>
diff --git a/include/msgpack/v1/adaptor/cpp20/span.hpp b/include/msgpack/v1/adaptor/cpp20/span.hpp
index f25333565..cd1cf1d5f 100644
--- a/include/msgpack/v1/adaptor/cpp20/span.hpp
+++ b/include/msgpack/v1/adaptor/cpp20/span.hpp
@@ -18,6 +18,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 #include "msgpack/meta.hpp"
 
diff --git a/include/msgpack/v1/adaptor/deque.hpp b/include/msgpack/v1/adaptor/deque.hpp
index 41a0bef69..f4fe5e20a 100644
--- a/include/msgpack/v1/adaptor/deque.hpp
+++ b/include/msgpack/v1/adaptor/deque.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <deque>
diff --git a/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp b/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
index 6333f660a..15672245c 100644
--- a/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
+++ b/include/msgpack/v1/adaptor/detail/cpp11_define_array_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 /// @cond
diff --git a/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp b/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
index 403e68c07..0399e52ac 100644
--- a/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
+++ b/include/msgpack/v1/adaptor/detail/cpp11_define_map_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 /// @cond
diff --git a/include/msgpack/v1/adaptor/ext_decl.hpp b/include/msgpack/v1/adaptor/ext_decl.hpp
index 4d43c2a93..fb5ac9c30 100644
--- a/include/msgpack/v1/adaptor/ext_decl.hpp
+++ b/include/msgpack/v1/adaptor/ext_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include <cstring>
 #include <string>
 
diff --git a/include/msgpack/v1/adaptor/fixint_decl.hpp b/include/msgpack/v1/adaptor/fixint_decl.hpp
index 1c4a439a9..ba24a79f3 100644
--- a/include/msgpack/v1/adaptor/fixint_decl.hpp
+++ b/include/msgpack/v1/adaptor/fixint_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/int.hpp"
 
 namespace msgpack {
diff --git a/include/msgpack/v1/adaptor/int_decl.hpp b/include/msgpack/v1/adaptor/int_decl.hpp
index 75f1c7bf4..b3d43bafc 100644
--- a/include/msgpack/v1/adaptor/int_decl.hpp
+++ b/include/msgpack/v1/adaptor/int_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include <limits>
 
 namespace msgpack {
diff --git a/include/msgpack/v1/adaptor/list.hpp b/include/msgpack/v1/adaptor/list.hpp
index d16c8d219..73051af4b 100644
--- a/include/msgpack/v1/adaptor/list.hpp
+++ b/include/msgpack/v1/adaptor/list.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <list>
diff --git a/include/msgpack/v1/adaptor/nil_decl.hpp b/include/msgpack/v1/adaptor/nil_decl.hpp
index 4830ff201..28da87900 100644
--- a/include/msgpack/v1/adaptor/nil_decl.hpp
+++ b/include/msgpack/v1/adaptor/nil_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 
diff --git a/include/msgpack/v1/adaptor/pair.hpp b/include/msgpack/v1/adaptor/pair.hpp
index 890abc2b8..422454ac7 100644
--- a/include/msgpack/v1/adaptor/pair.hpp
+++ b/include/msgpack/v1/adaptor/pair.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/meta.hpp"
 
 #include <utility>
diff --git a/include/msgpack/v1/adaptor/raw_decl.hpp b/include/msgpack/v1/adaptor/raw_decl.hpp
index db186d18a..4dcf2ee73 100644
--- a/include/msgpack/v1/adaptor/raw_decl.hpp
+++ b/include/msgpack/v1/adaptor/raw_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include <cstring>
 #include <string>
 
diff --git a/include/msgpack/v1/adaptor/size_equal_only_decl.hpp b/include/msgpack/v1/adaptor/size_equal_only_decl.hpp
index 6eac047b0..6337ac05b 100644
--- a/include/msgpack/v1/adaptor/size_equal_only_decl.hpp
+++ b/include/msgpack/v1/adaptor/size_equal_only_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/msgpack_tuple.hpp"
 
 namespace msgpack {
diff --git a/include/msgpack/v1/adaptor/string.hpp b/include/msgpack/v1/adaptor/string.hpp
index ca7d3e509..6e5c91d9a 100644
--- a/include/msgpack/v1/adaptor/string.hpp
+++ b/include/msgpack/v1/adaptor/string.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <string>
diff --git a/include/msgpack/v1/adaptor/tr1/unordered_map.hpp b/include/msgpack/v1/adaptor/tr1/unordered_map.hpp
index 9c8190e85..b24ac2319 100644
--- a/include/msgpack/v1/adaptor/tr1/unordered_map.hpp
+++ b/include/msgpack/v1/adaptor/tr1/unordered_map.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
diff --git a/include/msgpack/v1/adaptor/tr1/unordered_set.hpp b/include/msgpack/v1/adaptor/tr1/unordered_set.hpp
index dd6c0448f..9c92c2108 100644
--- a/include/msgpack/v1/adaptor/tr1/unordered_set.hpp
+++ b/include/msgpack/v1/adaptor/tr1/unordered_set.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #if defined(_LIBCPP_VERSION) || (_MSC_VER >= 1700)
diff --git a/include/msgpack/v1/adaptor/v4raw_decl.hpp b/include/msgpack/v1/adaptor/v4raw_decl.hpp
index ae213f7e2..aad031157 100644
--- a/include/msgpack/v1/adaptor/v4raw_decl.hpp
+++ b/include/msgpack/v1/adaptor/v4raw_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 
diff --git a/include/msgpack/v1/adaptor/vector.hpp b/include/msgpack/v1/adaptor/vector.hpp
index ad2a8f7c1..349def4ab 100644
--- a/include/msgpack/v1/adaptor/vector.hpp
+++ b/include/msgpack/v1/adaptor/vector.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <vector>
diff --git a/include/msgpack/v1/adaptor/vector_char.hpp b/include/msgpack/v1/adaptor/vector_char.hpp
index 9849e9600..fa958c873 100644
--- a/include/msgpack/v1/adaptor/vector_char.hpp
+++ b/include/msgpack/v1/adaptor/vector_char.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <vector>
diff --git a/include/msgpack/v1/adaptor/vector_unsigned_char.hpp b/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
index 342e2e18f..f4611a797 100644
--- a/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
+++ b/include/msgpack/v1/adaptor/vector_unsigned_char.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <vector>
diff --git a/include/msgpack/v1/adaptor/wstring.hpp b/include/msgpack/v1/adaptor/wstring.hpp
index dab263e44..e57f6752c 100644
--- a/include/msgpack/v1/adaptor/wstring.hpp
+++ b/include/msgpack/v1/adaptor/wstring.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 #include "msgpack/adaptor/check_container_size.hpp"
 
 #include <vector>
diff --git a/include/msgpack/v1/sbuffer.hpp b/include/msgpack/v1/sbuffer.hpp
index 8b8df7836..7ab303106 100644
--- a/include/msgpack/v1/sbuffer.hpp
+++ b/include/msgpack/v1/sbuffer.hpp
@@ -10,6 +10,7 @@
 #ifndef MSGPACK_V1_SBUFFER_HPP
 #define MSGPACK_V1_SBUFFER_HPP
 
+#include "msgpack/v1/cpp_config_decl.hpp"
 #include "msgpack/v1/sbuffer_decl.hpp"
 #include "msgpack/assert.hpp"
 
diff --git a/include/msgpack/v2/adaptor/v4raw_decl.hpp b/include/msgpack/v2/adaptor/v4raw_decl.hpp
index b39ef0cfb..6dde1ac6e 100644
--- a/include/msgpack/v2/adaptor/v4raw_decl.hpp
+++ b/include/msgpack/v2/adaptor/v4raw_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {
 
diff --git a/include/msgpack/v3/adaptor/v4raw_decl.hpp b/include/msgpack/v3/adaptor/v4raw_decl.hpp
index cc4f841f7..e9b4f0952 100644
--- a/include/msgpack/v3/adaptor/v4raw_decl.hpp
+++ b/include/msgpack/v3/adaptor/v4raw_decl.hpp
@@ -12,6 +12,7 @@
 
 #include "msgpack/versioning.hpp"
 #include "msgpack/adaptor/adaptor_base.hpp"
+#include "msgpack/object.hpp"
 
 namespace msgpack {