diff --git a/cpmfile.json b/cpmfile.json
index ee5fb89c15..fb6723caad 100644
--- a/cpmfile.json
+++ b/cpmfile.json
@@ -20,7 +20,7 @@
         "hash": "4fb7f6fde92762305aad8754d7643cd918dd1f3f67e104e9ab385b18c73178d72a17321354eb203b790b6702f2cf6d725a5d6e2dfbc63b1e35f9eb59fb42ece9",
         "git_version": "1.89.0",
         "version": "1.57",
-        "find_args": "CONFIG",
+        "find_args": "CONFIG OPTIONAL_COMPONENTS headers context system fiber",
         "patches": [
             "0001-clang-cl.patch",
             "0002-use-marmasm.patch",
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index 9623deccd3..b07778be28 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -252,14 +252,13 @@ if(CXX_CLANG)
 endif()
 
 if (BOOST_NO_HEADERS)
-    target_link_libraries(common PUBLIC Boost::algorithm Boost::icl Boost::pool)
-    if (NOT MINGW)
-      target_link_libraries(common PRIVATE Boost::filesystem)
-    endif()
+    target_link_libraries(common PUBLIC Boost::algorithm Boost::icl Boost::pool Boost::filesystem)
 else()
     target_link_libraries(common PUBLIC Boost::headers)
 endif()
 
+target_link_libraries(common PUBLIC Boost::filesystem)
+
 if (lz4_ADDED)
     target_include_directories(common PRIVATE ${lz4_SOURCE_DIR}/lib)
 endif()