diff --git a/src/uct/ib/mlx5/gga/gga_mlx5.c b/src/uct/ib/mlx5/gga/gga_mlx5.c
index 5239afc75d7..2a3bdc42f37 100644
--- a/src/uct/ib/mlx5/gga/gga_mlx5.c
+++ b/src/uct/ib/mlx5/gga/gga_mlx5.c
@@ -906,7 +906,7 @@ static void uct_ib_mlx5_gga_md_close(uct_md_h md)
                 ucs_assertv(rkey2md_refcount == 1,
                             "gga rkey %p references to md %p wrong number of "
                             "times: %lu", rkey.handle, gga_md, rkey2md_refcount);
-                if (!ENABLE_ASSERT) {
+                if (!UCS_ENABLE_ASSERT) {
                     break;
                 }
             }
diff --git a/test/gtest/uct/test_p2p_rma.cc b/test/gtest/uct/test_p2p_rma.cc
index ac4ed8ea0ad..4d2c434b4aa 100644
--- a/test/gtest/uct/test_p2p_rma.cc
+++ b/test/gtest/uct/test_p2p_rma.cc
@@ -5,7 +5,6 @@
 */
 
 #include "test_p2p_rma.h"
-#include "ucs/sys/math.h"
 
 #include <functional>