diff --git a/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h b/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h
index 7d7d310..aa1e2f1 100644
--- a/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h
+++ b/algorithms_cpp/include/embb/algorithms/internal/quick_sort-inl.h
@@ -29,8 +29,9 @@
 
 #include <cassert>
 #include <iterator>
-#include <utility>
 #include <functional>
+#include <utility>   // swap C++ 11
+#include <algorithm> // swap C++ 98
 
 #include <embb/base/exceptions.h>
 #include <embb/mtapi/mtapi.h>
diff --git a/base_cpp/include/embb/base/internal/mutex-inl.h b/base_cpp/include/embb/base/internal/mutex-inl.h
index f8aed8e..a8ac8c5 100644
--- a/base_cpp/include/embb/base/internal/mutex-inl.h
+++ b/base_cpp/include/embb/base/internal/mutex-inl.h
@@ -28,7 +28,8 @@
 #define EMBB_BASE_INTERNAL_MUTEX_INL_H_
 
 #include <cassert>
-#include <utility>
+#include <utility>   // swap C++ 11
+#include <algorithm> // swap C++ 98
 
 namespace embb {
 namespace base {