diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e151d8..fb5285b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -217,8 +217,9 @@ jobs:
           git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python3 tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY
+          git submodule update --init tools/boostdep libs/functional
+          python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
           ./bootstrap.sh
           ./b2 -d0 headers
 
@@ -280,8 +281,9 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY%
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
           cmd /c bootstrap
           b2 -d0 headers
 
@@ -328,8 +330,9 @@ jobs:
           git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
 
       - name: Use library with add_subdirectory
         run: |
@@ -376,8 +379,9 @@ jobs:
           git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
 
       - name: Configure
         run: |
@@ -434,8 +438,9 @@ jobs:
           git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" $LIBRARY
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
 
       - name: Configure
         run: |
@@ -483,8 +488,9 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY%
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
 
       - name: Use library with add_subdirectory (Debug)
         shell: cmd
@@ -532,8 +538,9 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY%
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
 
       - name: Configure
         shell: cmd
@@ -599,8 +606,9 @@ jobs:
           git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
           cd boost-root
           xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --include test --git_args "--jobs 3" %LIBRARY%
+          git submodule update --init tools/boostdep libs/functional
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
+          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" functional
 
       - name: Configure
         shell: cmd