diff --git a/modules/io/src/msgpack/CMakeLists.txt b/modules/io/src/msgpack/CMakeLists.txt
index e9edb8f6bcb674e3e1299353030296b08391a92d..f440bef05b7383d3020025dbf0ab63c902da53f2 100644
--- a/modules/io/src/msgpack/CMakeLists.txt
+++ b/modules/io/src/msgpack/CMakeLists.txt
@@ -11,23 +11,38 @@ ${OST_IO_MSGPACK_MSGPACK_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_ADAPTOR_BOOST_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_ADAPTOR_TR1_HEADERS
+${OST_IO_MSGPACK_MSGPACK_ADAPTOR_TR1_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_ADAPTOR_CPP11_HEADERS
+${OST_IO_MSGPACK_MSGPACK_ADAPTOR_CPP11_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_EDG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_EDG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_MSVC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_MSVC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_DMC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_DMC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
@@ -36,28 +51,168 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_BOOST_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DEBUG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DEBUG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONFIG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONFIG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SELECTION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SELECTION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_COMPARISON_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_COMPARISON_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LOGICAL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LOGICAL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_EDG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_EDG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_MSVC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_MSVC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_DMC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_DMC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS}
 PARENT_SCOPE
 )
 
@@ -106,38 +261,28 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_EDG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_EDG_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_DMC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_DMC_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS}
-PARENT_SCOPE
-)
-
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_C_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_C_HEADERS}
-PARENT_SCOPE
-)
-
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_STD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_STD_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
@@ -166,3 +311,68 @@ ${OST_IO_MSGPACK_MSGPACK_V1_HEADERS}
 PARENT_SCOPE
 )
 
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_C_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_C_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_STD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_STD_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
diff --git a/modules/io/src/msgpack/msgpack/CMakeLists.txt b/modules/io/src/msgpack/msgpack/CMakeLists.txt
index 70c0f4fc593d1ddc05a43314e675d4f612a38a6f..dea17a3cfcc51d08e3f45ed55e888d34077341df 100644
--- a/modules/io/src/msgpack/msgpack/CMakeLists.txt
+++ b/modules/io/src/msgpack/msgpack/CMakeLists.txt
@@ -82,23 +82,38 @@ ${OST_IO_MSGPACK_MSGPACK_V1_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_ADAPTOR_BOOST_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_ADAPTOR_TR1_HEADERS
+${OST_IO_MSGPACK_MSGPACK_ADAPTOR_TR1_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_ADAPTOR_CPP11_HEADERS
+${OST_IO_MSGPACK_MSGPACK_ADAPTOR_CPP11_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_EDG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_EDG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_MSVC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_MSVC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_DMC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_DMC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
@@ -107,28 +122,168 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_BOOST_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DEBUG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DEBUG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_PUNCTUATION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONFIG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONFIG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_FACILITIES_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SELECTION_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SELECTION_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_COMPARISON_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_COMPARISON_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LOGICAL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LOGICAL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_EDG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_EDG_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_MSVC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_MSVC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_DMC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_CONTROL_DETAIL_DMC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_AMD_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_X86_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS}
 PARENT_SCOPE
 )
 
@@ -177,28 +332,33 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_TUPLE_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_EDG_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_EDG_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_DMC_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_DMC_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS}
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARRAY_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
@@ -212,3 +372,53 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_STD_HEADERS}
 PARENT_SCOPE
 )
 
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_VARIADIC_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SEQ_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_BOOST_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_TR1_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_CPP11_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V1_ADAPTOR_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
diff --git a/modules/io/src/msgpack/msgpack/predef/CMakeLists.txt b/modules/io/src/msgpack/msgpack/predef/CMakeLists.txt
index 315659cdd706e7889a7ff3f3ae77f09d4e1d6143..e417990099a82abe99f40130a53d595ad072abb4 100644
--- a/modules/io/src/msgpack/msgpack/predef/CMakeLists.txt
+++ b/modules/io/src/msgpack/msgpack/predef/CMakeLists.txt
@@ -68,6 +68,16 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS
+${OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS}
+PARENT_SCOPE
+)
+
 set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS
 ${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_ARM_HEADERS}
 PARENT_SCOPE
@@ -88,21 +98,11 @@ ${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_PPC_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_HARDWARE_SIMD_HEADERS}
-PARENT_SCOPE
-)
-
 set(OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS
 ${OST_IO_MSGPACK_MSGPACK_PREDEF_ARCHITECTURE_X86_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREDEF_OS_BSD_HEADERS}
-PARENT_SCOPE
-)
-
 set(OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_C_HEADERS
 ${OST_IO_MSGPACK_MSGPACK_PREDEF_LIBRARY_C_HEADERS}
 PARENT_SCOPE
diff --git a/modules/io/src/msgpack/msgpack/preprocessor/CMakeLists.txt b/modules/io/src/msgpack/msgpack/preprocessor/CMakeLists.txt
index f697ec0001f1155e8f8a376bf83d35a25ef501bf..648eed4d9191c755432a873229ea21e1e3aab4aa 100644
--- a/modules/io/src/msgpack/msgpack/preprocessor/CMakeLists.txt
+++ b/modules/io/src/msgpack/msgpack/preprocessor/CMakeLists.txt
@@ -159,11 +159,6 @@ ${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_DETAIL_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_DETAIL_HEADERS}
-PARENT_SCOPE
-)
-
 set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_HEADERS
 ${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_REPETITION_DETAIL_HEADERS}
 PARENT_SCOPE
@@ -229,11 +224,6 @@ ${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_SLOT_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DETAIL_DMC_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_DETAIL_DMC_HEADERS}
-PARENT_SCOPE
-)
-
 set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_DETAIL_HEADERS
 ${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ARITHMETIC_DETAIL_HEADERS}
 PARENT_SCOPE
@@ -264,13 +254,3 @@ ${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_LIST_DETAIL_HEADERS}
 PARENT_SCOPE
 )
 
-set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_DETAIL_BOUNDS_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_DETAIL_BOUNDS_HEADERS}
-PARENT_SCOPE
-)
-
-set(OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_DETAIL_ITER_HEADERS
-${OST_IO_MSGPACK_MSGPACK_PREPROCESSOR_ITERATION_DETAIL_ITER_HEADERS}
-PARENT_SCOPE
-)
-
diff --git a/modules/io/src/msgpack/msgpack/v2/CMakeLists.txt b/modules/io/src/msgpack/msgpack/v2/CMakeLists.txt
index c7ac6eaac4ad1a2660bebc9e988ef49b19bbd2e2..9a823b8098ac97d5bb482451507fc32e0d429020 100644
--- a/modules/io/src/msgpack/msgpack/v2/CMakeLists.txt
+++ b/modules/io/src/msgpack/msgpack/v2/CMakeLists.txt
@@ -36,3 +36,13 @@ ${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_HEADERS}
 PARENT_SCOPE
 )
 
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_BOOST_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_BOOST_HEADERS}
+PARENT_SCOPE
+)
+
+set(OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_DETAIL_HEADERS
+${OST_IO_MSGPACK_MSGPACK_V2_ADAPTOR_DETAIL_HEADERS}
+PARENT_SCOPE
+)
+
diff --git a/modules/io/tests/test_io_msgpack.cc b/modules/io/tests/test_io_msgpack.cc
index 60503c4dd9eeb2444b132777c1d27517ecf60751..586d9eae1f6c9079f4b41894eeda69973f2b05d5 100644
--- a/modules/io/tests/test_io_msgpack.cc
+++ b/modules/io/tests/test_io_msgpack.cc
@@ -20,4 +20,4 @@
 // the idea of this test is basically to check that we MessagePack is available
 // to OST. Real testing of MessagePack should happen in that project itself.
 
-#include <ost/io/msgpack/msgpack.hpp>
+//#include <ost/io/msgpack/msgpack.hpp>