diff --git a/src/util/hsa_rsrc_factory.cpp b/src/util/hsa_rsrc_factory.cpp
index a0e13accac..9b27cacbbc 100644
--- a/src/util/hsa_rsrc_factory.cpp
+++ b/src/util/hsa_rsrc_factory.cpp
@@ -85,9 +85,10 @@ HsaRsrcFactory::HsaRsrcFactory() {
 
   // Get AqlProfile API table
   aqlprofile_api_ = {0};
+#ifdef ROCP_LD_AQLPROFILE
+  status = LoadAqlProfileLib(&aqlprofile_api_);
+#else
   status = hsa_system_get_extension_table(HSA_EXTENSION_AMD_AQLPROFILE, 1, 0, &aqlprofile_api_);
-#ifdef ROCP_LOAD_AQLPROF
-  if (status != HSA_STATUS_SUCCESS) status = LoadAqlProfileLib(&aqlprofile_api_);
 #endif
   CHECK_STATUS("aqlprofile API table load failed", status);
 
diff --git a/test/ctrl/tool.cpp b/test/ctrl/tool.cpp
index cf3acb04fa..9077c4718a 100644
--- a/test/ctrl/tool.cpp
+++ b/test/ctrl/tool.cpp
@@ -4,6 +4,7 @@
 //                                                                           //
 ///////////////////////////////////////////////////////////////////////////////
 
+#include <assert.h>
 #include <hsa.h>
 #include <pthread.h>
 #include <stdio.h>