diff --git a/CMakeLists.txt b/CMakeLists.txt
index 27304bfd40a99f2a62cd0943679911b26c1585ea..5b35b27f252122786133133bcf8c4db7b8dfa54d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -75,6 +75,8 @@ if(WIN32)
   find_package(Boost 1.48.0
                COMPONENTS thread chrono filesystem system date_time REQUIRED)
   add_definitions(-DBOOST_ALL_NO_LIB)
+  # Boost 1.70 and above need autolinking help from BoostConfig.cmake.
+  add_definitions(-DBOOST_UUID_FORCE_AUTO_LINK)
 else()
   find_package(Boost 1.45.0
                COMPONENTS thread filesystem system date_time REQUIRED)
diff --git a/remus/common/CMakeLists.txt b/remus/common/CMakeLists.txt
index 596a10a6a3cd9ab488756ba4d77407039df5cab8..b7028f0ee27c8fb7f98f0b6ce4ca991c2f8a84fa 100644
--- a/remus/common/CMakeLists.txt
+++ b/remus/common/CMakeLists.txt
@@ -42,7 +42,7 @@ set(srcs
 add_library(RemusCommon ${srcs} ${headers})
 target_link_libraries(RemusCommon
                       LINK_PRIVATE RemusSysTools ${Boost_LIBRARIES}
-)
+                      )
 target_include_directories(RemusCommon
                            PUBLIC  ${Boost_INCLUDE_DIRS}
                                    $<BUILD_INTERFACE:${Remus_SOURCE_DIR}>
@@ -50,10 +50,6 @@ target_include_directories(RemusCommon
                                    $<INSTALL_INTERFACE:include>
                            PRIVATE ${RemusSysTools_BINARY_DIR} )
 
-if (WIN32)
-  # Work around a boost 1.71.0 bug that omits bcrypt dependency:
-  target_compile_definitions(RemusCommon PUBLIC BOOST_UUID_FORCE_AUTO_LINK=1)
-endif()
 if(APPLE)
   #needed for LocateFile
   find_library(COREFOUNDATION_LIBRARY CoreFoundation )