diff --git a/build.jam b/build.jam
index 486889cd..f7973376 100644
--- a/build.jam
+++ b/build.jam
@@ -1,7 +1,7 @@
-# Copyright René Ferdinand Rivera Morell 2023-2024
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or copy at
-# http://www.boost.org/LICENSE_1_0.txt)
+# https://www.boost.org/LICENSE_1_0.txt
 
 require-b2 5.2 ;
 
@@ -10,13 +10,11 @@ constant boost_dependencies :
     /boost/config//boost_config
     /boost/throw_exception//boost_throw_exception
     /boost/variant2//boost_variant2
-    /boost/winapi//boost_winapi ;
-
-project /boost/system
-    : common-requirements
-        <include>include
+    /boost/winapi//boost_winapi
     ;
 
+project /boost/system ;
+
 explicit
     [ alias boost_system : build//boost_system ]
     [ alias all : boost_system test ]
@@ -25,4 +23,3 @@ explicit
 call-if : boost-library system
     : install boost_system
     ;
-
diff --git a/build/Jamfile.v2 b/build/Jamfile.v2
index 13d3f792..affde33e 100644
--- a/build/Jamfile.v2
+++ b/build/Jamfile.v2
@@ -1,16 +1,15 @@
 # Boost System Library Build Jamfile
-
-# (C) Copyright Beman Dawes 2002, 2006
-
+# Copyright 2002, 2006 Beman Dawes
+# Copyright 2024 Peter Dimov
 # Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE_1_0.txt or www.boost.org/LICENSE_1_0.txt)
+# https://www.boost.org/LICENSE_1_0.txt
 
 # See library home page at https://www.boost.org/libs/system
 
 project
-    : source-location ../src
-    : common-requirements <library>$(boost_dependencies)
-    : usage-requirements  # pass these requirement to dependents (i.e. users)
+    : common-requirements
+      <include>../include
+      <library>$(boost_dependencies)
       <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
       <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
       <define>BOOST_SYSTEM_NO_LIB=1
@@ -18,8 +17,4 @@ project
 
 SOURCES = error_code ;
 
-lib boost_system
-   : $(SOURCES).cpp
-   : <link>shared:<define>BOOST_SYSTEM_DYN_LINK=1
-     <link>static:<define>BOOST_SYSTEM_STATIC_LINK=1
-   ;
+lib boost_system : ../src/$(SOURCES).cpp ;
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 7d3ae58c..9d9a4919 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -18,7 +18,6 @@ project
   : requirements
 
     <library>/boost/system//boost_system
-
     <library>/boost/core//boost_core
 
     <toolset>msvc:<warnings-as-errors>on