diff --git a/CMakeLists.txt b/CMakeLists.txt
index b533f01..2da6baa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,6 +259,10 @@ target_link_libraries(TransferBench PRIVATE dl)
 target_link_libraries(TransferBench PRIVATE ${NUMA_LIBRARY})
 target_link_libraries(TransferBench PRIVATE ${HSA_LIBRARY})
 
+# gcc <9 ships std::filesystem in a separate library (libstdc++fs).
+# Required on AlmaLinux 8 / manylinux_2_28; harmless no-op stub on newer toolchains.
+target_link_libraries(TransferBench PRIVATE stdc++fs)
+
 rocm_install(TARGETS TransferBench COMPONENT devel)
 rocm_setup_version(VERSION ${VERSION_STRING})
 
diff --git a/src/client/Presets/AllToAll.hpp b/src/client/Presets/AllToAll.hpp
index 49ea5db..2beae8a 100644
--- a/src/client/Presets/AllToAll.hpp
+++ b/src/client/Presets/AllToAll.hpp
@@ -20,6 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#include <limits>
+
 int AllToAllPreset(EnvVars&           ev,
                     size_t      const  numBytesPerTransfer,
                     std::string const  presetName)
diff --git a/src/client/Presets/AllToAllN.hpp b/src/client/Presets/AllToAllN.hpp
index 8288747..7dac6b2 100644
--- a/src/client/Presets/AllToAllN.hpp
+++ b/src/client/Presets/AllToAllN.hpp
@@ -20,6 +20,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#include <limits>
 #include "EnvVars.hpp"
 
 int AllToAllRdmaPreset(EnvVars&           ev,
diff --git a/src/client/Presets/NicPeerToPeer.hpp b/src/client/Presets/NicPeerToPeer.hpp
index 11463f5..24f5d71 100644
--- a/src/client/Presets/NicPeerToPeer.hpp
+++ b/src/client/Presets/NicPeerToPeer.hpp
@@ -20,6 +20,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
 
+#include <numeric>
+
 // Helper functions
 
 // Returns a schedule of round robin pairing of N elements, using Circle Method
diff --git a/src/client/Utilities.hpp b/src/client/Utilities.hpp
index 7604c7a..0ba93fc 100644
--- a/src/client/Utilities.hpp
+++ b/src/client/Utilities.hpp
@@ -21,6 +21,7 @@ THE SOFTWARE.
 */
 
 #pragma once
+#include <iomanip>
 #include <unordered_map>
 #include <unordered_set>
 #include "TransferBench.hpp"
diff --git a/src/header/TransferBench.hpp b/src/header/TransferBench.hpp
index 113de96..7b74dc5 100644
--- a/src/header/TransferBench.hpp
+++ b/src/header/TransferBench.hpp
@@ -25,7 +25,6 @@ THE SOFTWARE.
 #include <algorithm>
 #include <arpa/inet.h>
 #include <atomic>
-#include <barrier>
 #include <cstring>
 #include <fcntl.h>
 #include <filesystem>