diff --git a/CMakeLists.txt b/CMakeLists.txt
index 58601166..4720411c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,12 +84,9 @@ if(BUILD_FAIRMQ)
     COMPONENTS
     container
     program_options
-    thread
-    system
     filesystem
-    regex
     date_time
-    signals
+    regex
     ${asiofi_Boost_COMPONENTS}
   )
   find_package2(PUBLIC FairLogger REQUIRED
@@ -213,6 +210,8 @@ install_cmake_package()
 
 
 # Summary ######################################################################
+message(STATUS "  ")
+message(STATUS "  ${Cyan}CXX STANDARD${CR}       ${BGreen}C++${CMAKE_CXX_STANDARD}${CR} (>= C++${PROJECT_MIN_CXX_STANDARD}, change with ${BMagenta}-DCMAKE_CXX_STANDARD=17${CR})")
 if(CMAKE_CXX_FLAGS)
   message(STATUS "  ")
   message(STATUS "  ${Cyan}GLOBAL CXX FLAGS${CR}  ${BGreen}${CMAKE_CXX_FLAGS}${CR}")
diff --git a/fairmq/CMakeLists.txt b/fairmq/CMakeLists.txt
index bc0547c3..73024ef6 100644
--- a/fairmq/CMakeLists.txt
+++ b/fairmq/CMakeLists.txt
@@ -17,17 +17,6 @@ if(BUILD_PMIX_PLUGIN)
 endif()
 
 
-############################
-# preprocessor definitions #
-############################
-if(BUILD_NANOMSG_TRANSPORT)
-  add_definitions(-DBUILD_NANOMSG_TRANSPORT)
-endif()
-if(BUILD_OFI_TRANSPORT)
-  add_definitions(-DBUILD_OFI_TRANSPORT)
-endif()
-
-
 ##########################
 # libFairMQ header files #
 ##########################
@@ -200,6 +189,19 @@ if(FAST_BUILD)
   set_target_properties(${_target} PROPERTIES OUTPUT_NAME FairMQ)
 endif()
 
+
+############################
+# preprocessor definitions #
+############################
+target_compile_definitions(${_target} PUBLIC BOOST_ERROR_CODE_HEADER_ONLY)
+if(BUILD_NANOMSG_TRANSPORT)
+  target_compile_definitions(${_target} PRIVATE BUILD_NANOMSG_TRANSPORT)
+endif()
+if(BUILD_OFI_TRANSPORT)
+  target_compile_definitions(${_target} PRIVATE BUILD_OFI_TRANSPORT)
+endif()
+
+
 #######################
 # include directories #
 #######################
@@ -240,11 +242,8 @@ target_link_libraries(${_target}
   $<$<PLATFORM_ID:Linux>:rt>
   Boost::boost
   Boost::program_options
-  Boost::thread
-  Boost::system
   Boost::filesystem
   Boost::regex
-  Boost::date_time
   FairLogger::FairLogger
 
   PRIVATE # only libFairMQ links against private dependencies